diff options
| author | IIMarckus <iimarckus@gmail.com> | 2015-06-23 14:21:54 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2015-06-23 14:21:54 -0600 |
| commit | 7ac6aa2d221c5fd87b57329e181b9d3602064b92 (patch) | |
| tree | f80379750bf18bf3981ce8f137a39c3b1991b3da | |
| parent | 205000fa9ae5f97e6edbce506084fb067f528206 (diff) | |
Begin enumerating std_scripts constants.
80 files changed, 133 insertions, 153 deletions
diff --git a/constants.asm b/constants.asm index 5531ca088..183a22324 100644 --- a/constants.asm +++ b/constants.asm @@ -23,3 +23,4 @@ INCLUDE "constants/animation_constants.asm" INCLUDE "constants/gfx_constants.asm" INCLUDE "constants/pokemon_data_constants.asm" INCLUDE "constants/misc_constants.asm" +INCLUDE "constants/std_constants.asm" diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 9ef09174b..b940d1466 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -1,16 +1,16 @@ StdScripts:: ; bc000 dbw BANK(PokeCenterNurseScript), PokeCenterNurseScript - dbw BANK(UnknownScript_0xbc162), UnknownScript_0xbc162 - dbw BANK(UnknownScript_0xbc166), UnknownScript_0xbc166 - dbw BANK(UnknownScript_0xbc16a), UnknownScript_0xbc16a - dbw BANK(UnknownScript_0xbc16e), UnknownScript_0xbc16e - dbw BANK(UnknownScript_0xbc172), UnknownScript_0xbc172 - dbw BANK(UnknownScript_0xbc176), UnknownScript_0xbc176 - dbw BANK(UnknownScript_0xbc17a), UnknownScript_0xbc17a - dbw BANK(UnknownScript_0xbc185), UnknownScript_0xbc185 - dbw BANK(UnknownScript_0xbc189), UnknownScript_0xbc189 - dbw BANK(UnknownScript_0xbc191), UnknownScript_0xbc191 - dbw BANK(UnknownScript_0xbc195), UnknownScript_0xbc195 + dbw BANK(DifficultBookshelfScript), DifficultBookshelfScript + dbw BANK(PictureBookshelfScript), PictureBookshelfScript + dbw BANK(MagazineBookshelfScript), MagazineBookshelfScript + dbw BANK(TeamRocketOathScript), TeamRocketOathScript + dbw BANK(IncenseBurnerScript), IncenseBurnerScript + dbw BANK(MerchandiseShelfScript), MerchandiseShelfScript + dbw BANK(TownMapScript), TownMapScript + 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 @@ -184,62 +184,51 @@ PokeCenterNurseScript: ; bc09c end ; bc162 -UnknownScript_0xbc162: ; 0xbc162 - farjumptext UnknownText_0x1b035a -; 0xbc166 +DifficultBookshelfScript: + farjumptext DifficultBookshelfText -UnknownScript_0xbc166: ; 0xbc166 - farjumptext UnknownText_0x1b0378 -; 0xbc16a +PictureBookshelfScript: + farjumptext PictureBookshelfText -UnknownScript_0xbc16a: ; 0xbc16a - farjumptext UnknownText_0x1b03a3 -; 0xbc16e +MagazineBookshelfScript: + farjumptext MagazineBookshelfText -UnknownScript_0xbc16e: ; 0xbc16e - farjumptext UnknownText_0x1b03d9 -; 0xbc172 +TeamRocketOathScript: + farjumptext TeamRocketOathText -UnknownScript_0xbc172: ; 0xbc172 - farjumptext UnknownText_0x1b0448 -; 0xbc176 +IncenseBurnerScript: + farjumptext IncenseBurnerText -UnknownScript_0xbc176: ; 0xbc176 - farjumptext UnknownText_0x1b0472 -; 0xbc17a +MerchandiseShelfScript: + farjumptext MerchandiseShelfText -UnknownScript_0xbc17a: ; 0xbc17a +TownMapScript: loadfont - farwritetext UnknownText_0x1b048d + farwritetext TownMapText closetext special Functionc2c0 loadmovesprites end -; 0xbc185 -UnknownScript_0xbc185: ; 0xbc185 - farjumptext UnknownText_0x1b04a0 -; 0xbc189 +WindowScript: + farjumptext WindowText -UnknownScript_0xbc189: ; 0xbc189 +TVScript: loadfont - farwritetext UnknownText_0x1b04be + farwritetext TVText closetext loadmovesprites end -; 0xbc191 -UnknownScript_0xbc191: ; 0xbc191 - farjumptext UnknownText_0x1b04c9 -; 0xbc195 +HomepageScript: + farjumptext HomepageText -UnknownScript_0xbc195: ; 0xbc195 +RadioScript: loadfont writebyte $0 special Functionc355 loadmovesprites end -; 0xbc19d UnknownScript_0xbc19d: ; 0xbc19d loadfont @@ -15475,15 +15475,15 @@ Function1365b:: ; 1365b ; 13681 .table1 - dbw $91, $0003 ; bookshelf + dbw $91, magazinebookshelf .table2 dbw $93, $0031 ; pc - dbw $94, $000b ; radio - dbw $95, $0007 ; map - dbw $96, $0006 ; merchandise - dbw $97, $0009 ; tv - dbw $9d, $0008 ; window - dbw $9f, $0005 ; incense burner + dbw $94, radio + dbw $95, townmap + dbw $96, merchandiseshelf + dbw $97, tv + dbw $9d, window + dbw $9f, incenseburner db $ff ; end ; 1369a diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 5b37978e3..6dd246dd5 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -14,7 +14,7 @@ UnknownScript_0x18db27: ; 0x18db27 ; 0x18db28 NurseScript_0x18db28: ; 0x18db28 - jumpstd $0000 + jumpstd pokecenternurse ; 0x18db2b GentlemanScript_0x18db2b: ; 0x18db2b diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm index 322735606..87b894fc6 100644 --- a/maps/BlackthornDodrioTradeHouse.asm +++ b/maps/BlackthornDodrioTradeHouse.asm @@ -16,7 +16,7 @@ LassScript_0x195a2a: ; 0x195a2a ; 0x195a31 MapBlackthornDodrioTradeHouseSignpost1Script: ; 0x195a31 - jumpstd $0003 + jumpstd magazinebookshelf ; 0x195a34 BlackthornDodrioTradeHouse_MapEventHeader: ; 0x195a34 diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm index 26b48b5ed..cc70b0841 100644 --- a/maps/BlackthornPokeCenter1F.asm +++ b/maps/BlackthornPokeCenter1F.asm @@ -7,7 +7,7 @@ BlackthornPokeCenter1F_MapScriptHeader: ; 0x195b77 ; 0x195b79 NurseScript_0x195b79: ; 0x195b79 - jumpstd $0000 + jumpstd pokecenternurse ; 0x195b7c GentlemanScript_0x195b7c: ; 0x195b7c diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 11ce2b04f..1b2cfedae 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -42,7 +42,7 @@ MapCeladonMansion1FSignpost0Script: ; 0x71410 ; 0x71413 MapCeladonMansion1FSignpost2Script: ; 0x71413 - jumpstd $0002 + jumpstd picturebookshelf ; 0x71416 UnknownText_0x71416: ; 0x71416 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index 2e7925f70..57b5eda5a 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -15,7 +15,7 @@ MapCeladonMansion2FSignpost1Script: ; 0x71533 ; 0x71536 MapCeladonMansion2FSignpost2Script: ; 0x71536 - jumpstd $0001 + jumpstd difficultbookshelf ; 0x71539 UnknownText_0x71539: ; 0x71539 diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index 8ec22eaff..905f65f75 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -7,7 +7,7 @@ CeladonPokeCenter1F_MapScriptHeader: ; 0x71e20 ; 0x71e22 NurseScript_0x71e22: ; 0x71e22 - jumpstd $0000 + jumpstd pokecenternurse ; 0x71e25 GentlemanScript_0x71e25: ; 0x71e25 diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index e5164ab4b..ff6f73607 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -7,7 +7,7 @@ CeruleanPokeCenter1F_MapScriptHeader: ; 0x18820d ; 0x18820f NurseScript_0x18820f: ; 0x18820f - jumpstd $0000 + jumpstd pokecenternurse ; 0x188212 SuperNerdScript_0x188212: ; 0x188212 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index a428530b4..fda2019a6 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -69,7 +69,7 @@ FarfetchdScript: end MapCharcoalKilnSignpost1Script: ; 0x18dd6e - jumpstd $0003 + jumpstd magazinebookshelf ; 0x18dd71 MapCharcoalKilnSignpost2Script: ; 0x18dd71 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index 8da0dfc28..16f3d2b41 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -23,7 +23,7 @@ LassScript_0x196cb9: ; 0x196cb9 ; 0x196cc0 MapCherrygroveEvolutionSpeechHouseSignpost1Script: ; 0x196cc0 - jumpstd $0003 + jumpstd magazinebookshelf ; 0x196cc3 UnknownText_0x196cc3: ; 0x196cc3 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index ddd354086..e31d9deb0 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -15,7 +15,7 @@ BugCatcherScript_0x196ae4: ; 0x196ae4 ; 0x196ae7 MapCherrygroveGymSpeechHouseSignpost1Script: ; 0x196ae7 - jumpstd $0002 + jumpstd picturebookshelf ; 0x196aea UnknownText_0x196aea: ; 0x196aea diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index 18d709797..402f1ff1c 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -7,7 +7,7 @@ CherrygrovePokeCenter1F_MapScriptHeader: ; 0x19696b ; 0x19696d NurseScript_0x19696d: ; 0x19696d - jumpstd $0000 + jumpstd pokecenternurse ; 0x196970 FisherScript_0x196970: ; 0x196970 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 31a0499e9..bc48e1acf 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -19,7 +19,7 @@ TwinScript_0x9e1b6: ; 0x9e1b6 ; 0x9e1b9 MapCianwoodLugiaSpeechHouseSignpost1Script: ; 0x9e1b9 - jumpstd $0002 + jumpstd picturebookshelf ; 0x9e1bc UnknownText_0x9e1bc: ; 0x9e1bc diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 8bd3cc3b0..e50ff6a12 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -41,7 +41,7 @@ UnknownScript_0x9dfc4: ; 0x9dfc4 ; 0x9dfca MapCianwoodPharmacySignpost1Script: ; 0x9dfca - jumpstd $0001 + jumpstd difficultbookshelf ; 0x9dfcd UnknownText_0x9dfcd: ; 0x9dfcd diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index 2be7f1df2..07e896cca 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -7,7 +7,7 @@ CianwoodPokeCenter1F_MapScriptHeader: ; 0x9dbcd ; 0x9dbcf NurseScript_0x9dbcf: ; 0x9dbcf - jumpstd $0000 + jumpstd pokecenternurse ; 0x9dbd2 LassScript_0x9dbd2: ; 0x9dbd2 diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm index 59fde2b89..8662da1d8 100644 --- a/maps/CinnabarPokeCenter1F.asm +++ b/maps/CinnabarPokeCenter1F.asm @@ -7,7 +7,7 @@ CinnabarPokeCenter1F_MapScriptHeader: ; 0x1ab32a ; 0x1ab32c NurseScript_0x1ab32c: ; 0x1ab32c - jumpstd $0000 + jumpstd pokecenternurse ; 0x1ab32f CooltrainerFScript_0x1ab32f: ; 0x1ab32f diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index eda9558fc..fc455598f 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -202,7 +202,7 @@ BirdScript_0x18afca: ; 0x18afca ; 0x18afcd MapCopycatsHouse2FSignpost1Script: ; 0x18afcd - jumpstd $0002 + jumpstd picturebookshelf ; 0x18afd0 MovementData_0x18afd0: ; 0x18afd0 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 101cf063c..cd721b923 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -80,7 +80,7 @@ UnknownScript_0x62fd1: ; 0x62fd1 ; 0x62fd7 MapDayCareSignpost1Script: ; 0x62fd7 - jumpstd $0001 + jumpstd difficultbookshelf ; 0x62fda UnknownText_0x62fda: ; 0x62fda diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 8f67d4fc0..204dbbf69 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -157,7 +157,7 @@ UnknownScript_0x68b27: ; 0x68b27 ; 0x68b2a MapEarlsPokemonAcademySignpost1Script: ; 0x68b2a - jumpstd $0001 + jumpstd difficultbookshelf ; 0x68b2d MovementData_0x68b2d: ; 0x68b2d diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index f793c0336..3c5b9ec41 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -58,7 +58,7 @@ UnknownScript_0x98e95: ; 0x98e95 ; 0x98eb0 NurseScript_0x98eb0: ; 0x98eb0 - jumpstd $0000 + jumpstd pokecenternurse ; 0x98eb3 PokefanMScript_0x98eb3: ; 0x98eb3 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 6b1ef1a91..d529d5ab5 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -19,7 +19,7 @@ MapElmsHouseSignpost0Script: ; 0x7aef1 ; 0x7aef4 MapElmsHouseSignpost2Script: ; 0x7aef4 - jumpstd $0001 + jumpstd difficultbookshelf ; 0x7aef7 UnknownText_0x7aef7: ; 0x7aef7 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index bad898e74..527ece16a 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -666,7 +666,7 @@ UnknownScript_0x78f61: ; 0x78f61 ; 0x78f64 MapElmsLabSignpost12Script: ; 0x78f64 - jumpstd $0001 + jumpstd difficultbookshelf ; 0x78f67 MovementData_0x78f67: ; 0x78f67 diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index ffaa50117..71f037610 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -14,7 +14,7 @@ UnknownScript_0x196458: ; 0x196458 ; 0x196459 NurseScript_0x196459: ; 0x196459 - jumpstd $0000 + jumpstd pokecenternurse ; 0x19645c CooltrainerMScript_0x19645c: ; 0x19645c diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 740c684b0..357e3e700 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -105,11 +105,11 @@ UnknownScript_0x54c64: ; 0x54c64 ; 0x54c6b MapGoldenrodBillsHouseSignpost1Script: ; 0x54c6b - jumpstd $0002 + jumpstd picturebookshelf ; 0x54c6e MapGoldenrodBillsHouseSignpost0Script: ; 0x54c6e - jumpstd $0003 + jumpstd magazinebookshelf ; 0x54c71 MapGoldenrodBillsHouseSignpost2Script: ; 0x54c71 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 6219fdf11..f85724467 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -81,11 +81,11 @@ UnknownScript_0x553c5: ; 0x553c5 ; 0x553cb UnknownScript_0x553cb: ; 0x553cb - jumpstd $0002 + jumpstd picturebookshelf ; 0x553ce UnknownScript_0x553ce: ; 0x553ce - jumpstd $0003 + jumpstd magazinebookshelf ; 0x553d1 UnknownScript_0x553d1: ; 0x553d1 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index afc59237b..4ce68b78a 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -71,7 +71,7 @@ TwinScript_0x5499a: ; 0x5499a ; 0x5499d MapGoldenrodHappinessRaterSignpost1Script: ; 0x5499d - jumpstd $0001 + jumpstd difficultbookshelf ; 0x549a0 MapGoldenrodHappinessRaterSignpost2Script: ; 0x549a0 diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm index 6e771c729..5faa66644 100644 --- a/maps/GoldenrodNameRatersHouse.asm +++ b/maps/GoldenrodNameRatersHouse.asm @@ -16,7 +16,7 @@ GentlemanScript_0x5577c: ; 0x5577c ; 0x55784 MapGoldenrodNameRatersHouseSignpost1Script: ; 0x55784 - jumpstd $0001 + jumpstd difficultbookshelf ; 0x55787 MapGoldenrodNameRatersHouseSignpost2Script: ; 0x55787 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index dc22e58f5..ff95d2870 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -15,11 +15,11 @@ LassScript_0x5564d: ; 0x5564d ; 0x55650 MapGoldenrodPPSpeechHouseSignpost1Script: ; 0x55650 - jumpstd $0001 + jumpstd difficultbookshelf ; 0x55653 MapGoldenrodPPSpeechHouseSignpost0Script: ; 0x55653 - jumpstd $0003 + jumpstd magazinebookshelf ; 0x55656 MapGoldenrodPPSpeechHouseSignpost2Script: ; 0x55656 diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index 986becdf8..2722dcff2 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -7,7 +7,7 @@ GoldenrodPokeCenter1F_MapScriptHeader: ; 0x60f8f ; 0x60f91 NurseScript_0x60f91: ; 0x60f91 - jumpstd $0000 + jumpstd pokecenternurse ; 0x60f94 UnknownScript_0x60f94: ; 0x60f94 diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 18ccf6bd2..841753b64 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -11,7 +11,7 @@ GrampsScript_0x196c07: ; 0x196c07 ; 0x196c0a MapGuideGentsHouseSignpost1Script: ; 0x196c0a - jumpstd $0003 + jumpstd magazinebookshelf ; 0x196c0d UnknownText_0x196c0d: ; 0x196c0d diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index bc2c75dcc..5e8fd4e1b 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -141,7 +141,7 @@ UnknownScript_0x18012b: ; 0x18012b ; 0x18012c NurseScript_0x18012c: ; 0x18012c - jumpstd $0000 + jumpstd pokecenternurse ; 0x18012f ClerkScript_0x18012f: ; 0x18012f diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 75b89a993..ae3d1e049 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -85,7 +85,7 @@ MapKrissHouse2FSignpost2Script: ; 0x7abda ; 0x7ac07 UnknownScript_0x7ac07: ; 0x7ac07 - jumpstd $000b + jumpstd radio ; 0x7ac0a UnknownScript_0x7ac0a: ; 0x7ac0a @@ -98,7 +98,7 @@ UnknownScript_0x7ac0a: ; 0x7ac0a MapKrissHouse2FSignpost3Script: ; 0x7ac12 - jumpstd $0002 + jumpstd picturebookshelf ; 0x7ac15 MapKrissHouse2FSignpost0Script: ; 0x7ac15 diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 436037909..8ef31fc3e 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -15,7 +15,7 @@ PokefanFScript_0x7acf1: ; 0x7acf1 ; 0x7acf4 MapKrissNeighborsHouseSignpost1Script: ; 0x7acf4 - jumpstd $0003 + jumpstd magazinebookshelf ; 0x7acf7 MapKrissNeighborsHouseSignpost2Script: ; 0x7acf7 @@ -40,7 +40,7 @@ MapKrissNeighborsHouseSignpost2Script: ; 0x7acf7 ; 0x7ad24 UnknownScript_0x7ad24: ; 0x7ad24 - jumpstd $000b + jumpstd radio ; 0x7ad27 UnknownScript_0x7ad27: ; 0x7ad27 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 9360e21de..a914f4ca2 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -471,7 +471,7 @@ MapKurtsHouseSignpost6Script: ; 0x18e45d ; 0x18e460 MapKurtsHouseSignpost5Script: ; 0x18e460 - jumpstd $0001 + jumpstd difficultbookshelf ; 0x18e463 MapKurtsHouseSignpost0Script: ; 0x18e463 diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index 144a82487..b715c0b17 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -31,7 +31,7 @@ UnknownScript_0x19a546: ; 0x19a546 ; 0x19a548 MapLakeofRageHiddenPowerHouseSignpost1Script: ; 0x19a548 - jumpstd $0001 + jumpstd difficultbookshelf ; 0x19a54b UnknownText_0x19a54b: ; 0x19a54b diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index b43935404..f9d7e217b 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -96,7 +96,7 @@ UnknownScript_0x19a728: ; 0x19a728 ; 0x19a72b MapLakeofRageMagikarpHouseSignpost1Script: ; 0x19a72b - jumpstd $0001 + jumpstd difficultbookshelf ; 0x19a72e UnknownText_0x19a72e: ; 0x19a72e diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index c300de2fc..a21e3872f 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -23,7 +23,7 @@ GentlemanScript_0x7eaf2: ; 0x7eaf2 ; 0x7eafa UnknownScript_0x7eafa: ; 0x7eafa - jumpstd $0001 + jumpstd difficultbookshelf ; 0x7eafd LavenderNameRater_MapEventHeader: ; 0x7eafd diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index 5f0f7fbe0..9aa227f5d 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -7,7 +7,7 @@ LavenderPokeCenter1F_MapScriptHeader: ; 0x7e69e ; 0x7e6a0 NurseScript_0x7e6a0: ; 0x7e6a0 - jumpstd $0000 + jumpstd pokecenternurse ; 0x7e6a3 GentlemanScript_0x7e6a3: ; 0x7e6a3 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index 4a0751fdb..1f65e1799 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -11,7 +11,7 @@ PokefanFScript_0x7ea47: ; 0x7ea47 ; 0x7ea4a MapLavenderTownSpeechHouseSignpost1Script: ; 0x7ea4a - jumpstd $0002 + jumpstd picturebookshelf ; 0x7ea4d UnknownText_0x7ea4d: ; 0x7ea4d diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm index e16adaf90..981b9e596 100644 --- a/maps/MahoganyPokeCenter1F.asm +++ b/maps/MahoganyPokeCenter1F.asm @@ -7,7 +7,7 @@ MahoganyPokeCenter1F_MapScriptHeader: ; 0x19a354 ; 0x19a356 NurseScript_0x19a356: ; 0x19a356 - jumpstd $0000 + jumpstd pokecenternurse ; 0x19a359 PokefanMScript_0x19a359: ; 0x19a359 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index e4dd252e0..d971a0757 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -105,7 +105,7 @@ UnknownScript_0x9d2fa: ; 0x9d2fa ; 0x9d300 UnknownScript_0x9d300: ; 0x9d300 - jumpstd $0002 + jumpstd picturebookshelf ; 0x9d303 UnknownText_0x9d303: ; 0x9d303 diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 5dd07ebf5..20d57401c 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -16,7 +16,7 @@ SuperNerdScript_0x195cb4: ; 0x195cb4 ; 0x195cbc MapMoveDeletersHouseSignpost1Script: ; 0x195cbc - jumpstd $0001 + jumpstd difficultbookshelf ; 0x195cbf MoveDeletersHouse_MapEventHeader: ; 0x195cbf diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index c7db5199c..e52cf55bc 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -42,7 +42,7 @@ MoltresScript_0x7e8e4: ; 0x7e8e4 ; 0x7e8ee MapMrFujisHouseSignpost1Script: ; 0x7e8ee - jumpstd $0001 + jumpstd difficultbookshelf ; 0x7e8f1 UnknownText_0x7e8f1: ; 0x7e8f1 diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index b2ab78827..da05c7a9c 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -25,7 +25,7 @@ UnknownScript_0x18a793: ; 0x18a793 ; 0x18a795 MapMrPsychicsHouseSignpost1Script: ; 0x18a795 - jumpstd $0001 + jumpstd difficultbookshelf ; 0x18a798 UnknownText_0x18a798: ; 0x18a798 diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index d9ca25232..48f85ce20 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -69,7 +69,7 @@ ScientistScript_0x19b415: ; 0x19b415 ; 0x19b418 MapOaksLabSignpost11Script: ; 0x19b418 - jumpstd $0001 + jumpstd difficultbookshelf ; 0x19b41b MapOaksLabSignpost12Script: ; 0x19b41b diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index a4e72f3b0..eaf380d56 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -39,7 +39,7 @@ UnknownScript_0x9c740: ; 0x9c740 ; 0x9c746 UnknownScript_0x9c746: ; 0x9c746 - jumpstd $0002 + jumpstd picturebookshelf ; 0x9c749 UnknownText_0x9c749: ; 0x9c749 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index d112fb075..64a1faf2c 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -20,11 +20,11 @@ RhydonScript_0x9c592: ; 0x9c592 ; 0x9c59c MapOlivineHouseBetaSignpost0Script: ; 0x9c59c - jumpstd $0002 + jumpstd picturebookshelf ; 0x9c59f MapOlivineHouseBetaSignpost1Script: ; 0x9c59f - jumpstd $0003 + jumpstd magazinebookshelf ; 0x9c5a2 UnknownText_0x9c5a2: ; 0x9c5a2 diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm index 004ebbf31..45e2a8224 100644 --- a/maps/OlivinePokeCenter1F.asm +++ b/maps/OlivinePokeCenter1F.asm @@ -7,7 +7,7 @@ OlivinePokeCenter1F_MapScriptHeader: ; 0x9c000 ; 0x9c002 NurseScript_0x9c002: ; 0x9c002 - jumpstd $0000 + jumpstd pokecenternurse ; 0x9c005 FishingGuruScript_0x9c005: ; 0x9c005 diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index 603e980cc..f9df01b12 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -15,11 +15,11 @@ LassScript_0x9c63a: ; 0x9c63a ; 0x9c63d MapOlivinePunishmentSpeechHouseSignpost1Script: ; 0x9c63d - jumpstd $0002 + jumpstd picturebookshelf ; 0x9c640 MapOlivinePunishmentSpeechHouseSignpost0Script: ; 0x9c640 - jumpstd $0003 + jumpstd magazinebookshelf ; 0x9c643 UnknownText_0x9c643: ; 0x9c643 diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm index 1e5134a62..9bc766a4d 100644 --- a/maps/OlivineVoltorbHouse.asm +++ b/maps/OlivineVoltorbHouse.asm @@ -16,7 +16,7 @@ FishingGuruScript_0x9c55c: ; 0x9c55c ; 0x9c563 MapOlivineVoltorbHouseSignpost1Script: ; 0x9c563 - jumpstd $0003 + jumpstd magazinebookshelf ; 0x9c566 OlivineVoltorbHouse_MapEventHeader: ; 0x9c566 diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index 9223c01e8..f8962f9c8 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -7,7 +7,7 @@ PewterPokeCenter1F_MapScriptHeader: ; 0x1a2ee5 ; 0x1a2ee7 NurseScript_0x1a2ee7: ; 0x1a2ee7 - jumpstd $0000 + jumpstd pokecenternurse ; 0x1a2eea TeacherScript_0x1a2eea: ; 0x1a2eea diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 29b5e2849..ccc099642 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -11,7 +11,7 @@ GrampsScript_0x1a3059: ; 0x1a3059 ; 0x1a305c MapPewterSnoozeSpeechHouseSignpost1Script: ; 0x1a305c - jumpstd $0002 + jumpstd picturebookshelf ; 0x1a305f UnknownText_0x1a305f: ; 0x1a305f diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index fc055ce53..48b9d35ed 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -210,7 +210,7 @@ GymGuyScript_0x188ecb: ; 0x188ecb ; 0x188ed2 MapPowerPlantSignpost1Script: ; 0x188ed2 - jumpstd $0001 + jumpstd difficultbookshelf ; 0x188ed5 MovementData_0x188ed5: ; 0x188ed5 diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 06fa58941..405b01418 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -421,7 +421,7 @@ MapRadioTower2FSignpost5Script: ; 0x5d91b ; 0x5d91e MapRadioTower2FSignpost4Script: ; 0x5d91e - jumpstd $0003 + jumpstd magazinebookshelf ; 0x5d921 MovementData_0x5d921: ; 0x5d921 diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 3789f82bb..114ba9fd2 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -177,7 +177,7 @@ MapRadioTower5FSignpost2Script: ; 0x60103 ; 0x60106 MapRadioTower5FSignpost4Script: ; 0x60106 - jumpstd $0003 + jumpstd magazinebookshelf ; 0x60109 MovementData_0x60109: ; 0x60109 diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 49bd8f53f..8a850d4c6 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -37,7 +37,7 @@ MapRedsHouse1FSignpost2Script: ; 0x19aeba ; 0x19aebd MapRedsHouse1FSignpost1Script: ; 0x19aebd - jumpstd $0002 + jumpstd picturebookshelf ; 0x19aec0 UnknownText_0x19aec0: ; 0x19aec0 diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index b4426e0e2..b5da11912 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -7,7 +7,7 @@ Route10PokeCenter1F_MapScriptHeader: ; 0x188bd2 ; 0x188bd4 NurseScript_0x188bd4: ; 0x188bd4 - jumpstd $0000 + jumpstd pokecenternurse ; 0x188bd7 GentlemanScript_0x188bd7: ; 0x188bd7 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 6fd7a9a3f..8fe2e66f4 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -35,7 +35,7 @@ UnknownScript_0x7f4aa: ; 0x7f4aa ; 0x7f4ac UnknownScript_0x7f4ac: ; 0x7f4ac - jumpstd $0002 + jumpstd picturebookshelf ; 0x7f4af UnknownText_0x7f4af: ; 0x7f4af diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 2b2af9aaf..2ca45599b 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -11,7 +11,7 @@ SuperNerdScript_0x73373: ; 0x73373 ; 0x73376 MapRoute16FuchsiaSpeechHouseSignpost1Script: ; 0x73376 - jumpstd $0002 + jumpstd picturebookshelf ; 0x73379 UnknownText_0x73379: ; 0x73379 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index b7ed379cf..851e5c18e 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -28,7 +28,7 @@ TeacherScript_0x7b125: ; 0x7b125 ; 0x7b14a MapRoute26HealSpeechHouseSignpost1Script: ; 0x7b14a - jumpstd $0002 + jumpstd picturebookshelf ; 0x7b14d UnknownText_0x7b14d: ; 0x7b14d diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 44597ff95..512bfc230 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -40,7 +40,7 @@ UnknownScript_0x7b3bd: ; 0x7b3bd ; 0x7b3c3 MapRoute27SandstormHouseSignpost1Script: ; 0x7b3c3 - jumpstd $0003 + jumpstd magazinebookshelf ; 0x7b3c6 UnknownText_0x7b3c6: ; 0x7b3c6 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index b5ab8fb8a..c2478e34d 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -45,7 +45,7 @@ MoltresScript_0x1ae675: ; 0x1ae675 ; 0x1ae67f MapRoute28FamousSpeechHouseSignpost1Script: ; 0x1ae67f - jumpstd $0003 + jumpstd magazinebookshelf ; 0x1ae682 UnknownText_0x1ae682: ; 0x1ae682 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index 0b5ef8a7a..60c4f33f1 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -25,7 +25,7 @@ UnknownScript_0x9b860: ; 0x9b860 ; 0x9b862 UnknownScript_0x9b862: ; 0x9b862 - jumpstd $0001 + jumpstd difficultbookshelf ; 0x9b865 UnknownText_0x9b865: ; 0x9b865 diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index 49fd7e30c..4d438c436 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -25,7 +25,7 @@ UnknownScript_0x196d7d: ; 0x196d7d ; 0x196d7f MapRoute30BerrySpeechHouseSignpost1Script: ; 0x196d7f - jumpstd $0003 + jumpstd magazinebookshelf ; 0x196d82 UnknownText_0x196d82: ; 0x196d82 diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index 27fd67517..602c502fc 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -7,7 +7,7 @@ Route32PokeCenter1F_MapScriptHeader: ; 0x69b50 ; 0x69b52 NurseScript_0x69b52: ; 0x69b52 - jumpstd $0000 + jumpstd pokecenternurse ; 0x69b55 FishingGuruScript_0x69b55: ; 0x69b55 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 15a6237c7..9ac882521 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -96,7 +96,7 @@ UnknownScript_0x9cf33: ; 0x9cf33 ; 0x9cf35 MapRoute39FarmhouseSignpost1Script: ; 0x9cf35 - jumpstd $0002 + jumpstd picturebookshelf ; 0x9cf38 UnknownText_0x9cf38: ; 0x9cf38 diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 35bc80743..a10d96a4f 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -29,7 +29,7 @@ TeacherScript_0x18b64f: ; 0x18b64f ; 0x18b652 MapRoute5CleanseTagSpeechHouseSignpost1Script: ; 0x18b652 - jumpstd $0001 + jumpstd difficultbookshelf ; 0x18b655 UnknownText_0x18b655: ; 0x18b655 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 4db19a8a0..a6c92f962 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -34,7 +34,7 @@ MapSafariZoneWardensHomeSignpost3Script: ; 0x1965e0 ; 0x1965e3 MapSafariZoneWardensHomeSignpost1Script: ; 0x1965e3 - jumpstd $0002 + jumpstd picturebookshelf ; 0x1965e6 UnknownText_0x1965e6: ; 0x1965e6 diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index 80fb0a283..03d560202 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -7,7 +7,7 @@ SaffronPokeCenter1F_MapScriptHeader: ; 0x18a47b ; 0x18a47d NurseScript_0x18a47d: ; 0x18a47d - jumpstd $0000 + jumpstd pokecenternurse ; 0x18a480 TeacherScript_0x18a480: ; 0x18a480 diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokeCenter1F.asm index 872068b4c..5de3ad7e3 100644 --- a/maps/SilverCavePokeCenter1F.asm +++ b/maps/SilverCavePokeCenter1F.asm @@ -7,7 +7,7 @@ SilverCavePokeCenter1F_MapScriptHeader: ; 0x1ae598 ; 0x1ae59a NurseScript_0x1ae59a: ; 0x1ae59a - jumpstd $0000 + jumpstd pokecenternurse ; 0x1ae59d GrannyScript_0x1ae59d: ; 0x1ae59d diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 4dbd519d3..5a5e7990b 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -556,7 +556,7 @@ MapTeamRocketBaseB1FSignpost5Script: ; 0x6ca96 ; 0x6ca99 MapTeamRocketBaseB1FSignpost7Script: ; 0x6ca99 - jumpstd $0004 + jumpstd teamrocketoath ; 0x6ca9c MapTeamRocketBaseB1FSignpost0Script: ; 0x6ca9c diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 5423de782..4ba63faf1 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -282,7 +282,7 @@ UnknownScript_0x6e10b: ; 0x6e10b ; 0x6e11d MapTeamRocketBaseB3FSignpost9Script: ; 0x6e11d - jumpstd $0004 + jumpstd teamrocketoath ; 0x6e120 ItemFragment_0x6e120: ; 0x6e120 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index caf32adcb..f93cb1f71 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -15,7 +15,7 @@ MapVermilionHouseFishingSpeechHouseSignpost0Script: ; 0x191490 ; 0x191493 UnknownScript_0x191493: ; 0x191493 - jumpstd $0002 + jumpstd picturebookshelf ; 0x191496 UnknownText_0x191496: ; 0x191496 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index beedfb90c..f557ff20e 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -15,7 +15,7 @@ YoungsterScript_0x191eba: ; 0x191eba ; 0x191ebd MapVermilionMagnetTrainSpeechHouseSignpost1Script: ; 0x191ebd - jumpstd $0002 + jumpstd picturebookshelf ; 0x191ec0 UnknownText_0x191ec0: ; 0x191ec0 diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index bfc36300f..c611b2b32 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -7,7 +7,7 @@ VermilionPokeCenter1F_MapScriptHeader: ; 0x191601 ; 0x191603 NurseScript_0x191603: ; 0x191603 - jumpstd $0000 + jumpstd pokecenternurse ; 0x191606 FishingGuruScript_0x191606: ; 0x191606 diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 915f69704..5b80e7d01 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -7,7 +7,7 @@ VioletPokeCenter1F_MapScriptHeader: ; 0x694c7 ; 0x694c9 NurseScript_0x694c9: ; 0x694c9 - jumpstd $0000 + jumpstd pokecenternurse ; 0x694cc ScientistScript_0x694cc: ; 0x694cc diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index a7b2c34ac..39bba37f7 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -7,7 +7,7 @@ ViridianPokeCenter1F_MapScriptHeader: ; 0x9b68e ; 0x9b690 NurseScript_0x9b690: ; 0x9b690 - jumpstd $0000 + jumpstd pokecenternurse ; 0x9b693 CooltrainerMScript_0x9b693: ; 0x9b693 diff --git a/text/common.asm b/text/common.asm index 3e32b56f8..dea5f243c 100644 --- a/text/common.asm +++ b/text/common.asm @@ -127,29 +127,26 @@ UnknownText_0x1b02d6: ; 0x1b02d6 done ; 0x1b035a -UnknownText_0x1b035a: ; 0x1b035a +DifficultBookshelfText: text "It's full of" line "difficult books." done -; 0x1b0378 -UnknownText_0x1b0378: ; 0x1b0378 +PictureBookshelfText: text "A whole collection" line "of #MON picture" cont "books!" done -; 0x1b03a3 -UnknownText_0x1b03a3: ; 0x1b03a3 +MagazineBookshelfText: text "#MON magazines…" line "#MON PAL," para "#MON HANDBOOK," line "#MON GRAPH…" done -; 0x1b03d9 -UnknownText_0x1b03d9: ; 0x1b03d9 +TeamRocketOathText: text "TEAM ROCKET OATH" para "Steal #MON for" @@ -162,46 +159,39 @@ UnknownText_0x1b03d9: ; 0x1b03d9 line "for the glory of" cont "TEAM ROCKET!" done -; 0x1b0448 -UnknownText_0x1b0448: ; 0x1b0448 +IncenseBurnerText: text "What is this?" para "Oh, it's an" line "incense burner!" done -; 0x1b0472 -UnknownText_0x1b0472: ; 0x1b0472 +MerchandiseShelfText: text "Lots of #MON" line "merchandise!" done -; 0x1b048d -UnknownText_0x1b048d: ; 0x1b048d +TownMapText: text "It's the TOWN MAP." done -; 0x1b04a0 -UnknownText_0x1b04a0: ; 0x1b04a0 +WindowText: text "My reflection!" line "Lookin' good!" done -; 0x1b04be -UnknownText_0x1b04be: ; 0x1b04be +TVText: text "It's a TV." done -; 0x1b04c9 -UnknownText_0x1b04c9: ; 0x1b04c9 +HomepageText: text "#MON JOURNAL" line "HOME PAGE…" para "It hasn't been" line "updated…" done -; 0x1b04f9 UnknownText_0x1b04f9: ; 0x1b04f9 text "#MON RADIO!" |