diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-10 16:44:16 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-10 16:44:16 -0400 |
| commit | 518cee440e89660ccf71b9a4f8850c80453ea926 (patch) | |
| tree | f6fa9853ea48a11b9a399b8df3869a3ad8f8a5bd | |
| parent | 32e7e368f4b3ae61bf4a219e89fc04ac8263f431 (diff) | |
Resolve #723: treat std scripts like specials and predefs
180 files changed, 561 insertions, 554 deletions
diff --git a/constants.asm b/constants.asm index 7864ec9d0..59248078f 100644 --- a/constants.asm +++ b/constants.asm @@ -46,7 +46,6 @@ INCLUDE "constants/sfx_constants.asm" INCLUDE "constants/sprite_anim_constants.asm" INCLUDE "constants/sprite_constants.asm" INCLUDE "constants/sprite_data_constants.asm" -INCLUDE "constants/std_constants.asm" INCLUDE "constants/tileset_constants.asm" INCLUDE "constants/trainer_constants.asm" INCLUDE "constants/trainer_data_constants.asm" diff --git a/constants/std_constants.asm b/constants/std_constants.asm deleted file mode 100644 index 18e64f450..000000000 --- a/constants/std_constants.asm +++ /dev/null @@ -1,55 +0,0 @@ -; StdScripts indexes (see engine/events/std_scripts.asm) -; also used in TileCollisionStdScripts (see data/events/collision_stdscripts.asm) - enum_start - enum pokecenternurse - enum difficultbookshelf - enum picturebookshelf - enum magazinebookshelf - enum teamrocketoath - enum incenseburner - enum merchandiseshelf - enum townmap - enum window - enum tv - enum homepage - enum radio1 - enum radio2 - enum trashcan - enum strengthboulder - enum smashrock - enum pokecentersign - enum martsign - enum goldenrodrockets - enum radiotowerrockets - enum elevatorbutton - enum daytotext - enum bugcontestresultswarp - enum bugcontestresults - enum initializeevents - enum asknumber1m - enum asknumber2m - enum registerednumberm - enum numberacceptedm - enum numberdeclinedm - enum phonefullm - enum rematchm - enum giftm - enum packfullm - enum rematchgiftm - enum asknumber1f - enum asknumber2f - enum registerednumberf - enum numberacceptedf - enum numberdeclinedf - enum phonefullf - enum rematchf - enum giftf - enum packfullf - enum rematchgiftf - enum gymstatue1 - enum gymstatue2 - enum receiveitem - enum receivetogepiegg - enum pcscript - enum gamecornercoinvendor - enum happinesschecknpc diff --git a/data/events/collision_stdscripts.asm b/data/events/collision_stdscripts.asm index dff26dd85..5c94c62f9 100644 --- a/data/events/collision_stdscripts.asm +++ b/data/events/collision_stdscripts.asm @@ -1,13 +1,18 @@ -; stdscripts associated with tile collisions +; std scripts associated with tile collisions + +stdcoll: MACRO + db \1 + dw (\2StdScript - StdScripts) / 3 +ENDM TileCollisionStdScripts: - ; collision type, stdscript - dbw COLL_BOOKSHELF, magazinebookshelf - dbw COLL_PC, pcscript - dbw COLL_RADIO, radio1 - dbw COLL_TOWN_MAP, townmap - dbw COLL_MART_SHELF, merchandiseshelf - dbw COLL_TV, tv - dbw COLL_WINDOW, window - dbw COLL_INCENSE_BURNER, incenseburner + ; collision type, std script + stdcoll COLL_BOOKSHELF, MagazineBookshelfScript + stdcoll COLL_PC, PCScript + stdcoll COLL_RADIO, Radio1Script + stdcoll COLL_TOWN_MAP, TownMapScript + stdcoll COLL_MART_SHELF, MerchandiseShelfScript + stdcoll COLL_TV, TVScript + stdcoll COLL_WINDOW, WindowScript + stdcoll COLL_INCENSE_BURNER, IncenseBurnerScript db -1 ; end diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index 6a3f77994..90d351304 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -30,7 +30,7 @@ BugCatchingContestOutOfBallsScript: BugCatchingContestReturnToGateScript: closetext - jumpstd bugcontestresultswarp + jumpstd BugContestResultsWarpScript BugCatchingContestTimeUpText: text_far _BugCatchingContestTimeUpText diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index b3a0082e1..3112d40e2 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -1,57 +1,61 @@ +add_stdscript: MACRO +\1StdScript:: + dba \1 +ENDM + StdScripts:: -; entries correspond to constants/std_constants.asm - dba PokecenterNurseScript - dba DifficultBookshelfScript - dba PictureBookshelfScript - dba MagazineBookshelfScript - dba TeamRocketOathScript - dba IncenseBurnerScript - dba MerchandiseShelfScript - dba TownMapScript - dba WindowScript - dba TVScript - dba HomepageScript - dba Radio1Script - dba Radio2Script - dba TrashCanScript - dba StrengthBoulderScript - dba SmashRockScript - dba PokecenterSignScript - dba MartSignScript - dba GoldenrodRocketsScript - dba RadioTowerRocketsScript - dba ElevatorButtonScript - dba DayToTextScript - dba BugContestResultsWarpScript - dba BugContestResultsScript - dba InitializeEventsScript - dba AskNumber1MScript - dba AskNumber2MScript - dba RegisteredNumberMScript - dba NumberAcceptedMScript - dba NumberDeclinedMScript - dba PhoneFullMScript - dba RematchMScript - dba GiftMScript - dba PackFullMScript - dba RematchGiftMScript - dba AskNumber1FScript - dba AskNumber2FScript - dba RegisteredNumberFScript - dba NumberAcceptedFScript - dba NumberDeclinedFScript - dba PhoneFullFScript - dba RematchFScript - dba GiftFScript - dba PackFullFScript - dba RematchGiftFScript - dba GymStatue1Script - dba GymStatue2Script - dba ReceiveItemScript - dba ReceiveTogepiEggScript - dba PCScript - dba GameCornerCoinVendorScript - dba HappinessCheckScript + add_stdscript PokecenterNurseScript + add_stdscript DifficultBookshelfScript + add_stdscript PictureBookshelfScript + add_stdscript MagazineBookshelfScript + add_stdscript TeamRocketOathScript + add_stdscript IncenseBurnerScript + add_stdscript MerchandiseShelfScript + add_stdscript TownMapScript + add_stdscript WindowScript + add_stdscript TVScript + add_stdscript HomepageScript + add_stdscript Radio1Script + add_stdscript Radio2Script + add_stdscript TrashCanScript + add_stdscript StrengthBoulderScript + add_stdscript SmashRockScript + add_stdscript PokecenterSignScript + add_stdscript MartSignScript + add_stdscript GoldenrodRocketsScript + add_stdscript RadioTowerRocketsScript + add_stdscript ElevatorButtonScript + add_stdscript DayToTextScript + add_stdscript BugContestResultsWarpScript + add_stdscript BugContestResultsScript + add_stdscript InitializeEventsScript + add_stdscript AskNumber1MScript + add_stdscript AskNumber2MScript + add_stdscript RegisteredNumberMScript + add_stdscript NumberAcceptedMScript + add_stdscript NumberDeclinedMScript + add_stdscript PhoneFullMScript + add_stdscript RematchMScript + add_stdscript GiftMScript + add_stdscript PackFullMScript + add_stdscript RematchGiftMScript + add_stdscript AskNumber1FScript + add_stdscript AskNumber2FScript + add_stdscript RegisteredNumberFScript + add_stdscript NumberAcceptedFScript + add_stdscript NumberDeclinedFScript + add_stdscript PhoneFullFScript + add_stdscript RematchFScript + add_stdscript GiftFScript + add_stdscript PackFullFScript + add_stdscript RematchGiftFScript + add_stdscript GymStatue1Script + add_stdscript GymStatue2Script + add_stdscript ReceiveItemScript + add_stdscript ReceiveTogepiEggScript + add_stdscript PCScript + add_stdscript GameCornerCoinVendorScript + add_stdscript HappinessCheckScript PokecenterNurseScript: ; EVENT_WELCOMED_TO_POKECOM_CENTER is never set diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index c9141ac2a..6daa8075d 100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -22,7 +22,7 @@ Script_Whiteout: endall .bug_contest - jumpstd bugcontestresultswarp + jumpstd BugContestResultsWarpScript .WhitedOutText: text_far _WhitedOutText diff --git a/macros/legacy.asm b/macros/legacy.asm index 8c6f2a9dd..3ba19d234 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -327,3 +327,57 @@ text_jump EQUS "text_far" anim_enemyfeetobj EQUS "anim_battlergfx_2row" anim_playerheadobj EQUS "anim_battlergfx_1row" anim_clearsprites EQUS "anim_keepsprites" + +; engine/events/std_scripts.asm +pokecenternurse EQUS "PokecenterNurseScript" +difficultbookshelf EQUS "DifficultBookshelfScript" +picturebookshelf EQUS "PictureBookshelfScript" +magazinebookshelf EQUS "MagazineBookshelfScript" +teamrocketoath EQUS "TeamRocketOathScript" +incenseburner EQUS "IncenseBurnerScript" +merchandiseshelf EQUS "MerchandiseShelfScript" +townmap EQUS "TownMapScript" +window EQUS "WindowScript" +tv EQUS "TVScript" +homepage EQUS "HomepageScript" +radio1 EQUS "Radio1Script" +radio2 EQUS "Radio2Script" +trashcan EQUS "TrashCanScript" +strengthboulder EQUS "StrengthBoulderScript" +smashrock EQUS "SmashRockScript" +pokecentersign EQUS "PokecenterSignScript" +martsign EQUS "MartSignScript" +goldenrodrockets EQUS "GoldenrodRocketsScript" +radiotowerrockets EQUS "RadioTowerRocketsScript" +elevatorbutton EQUS "ElevatorButtonScript" +daytotext EQUS "DayToTextScript" +bugcontestresultswarp EQUS "BugContestResultsWarpScript" +bugcontestresults EQUS "BugContestResultsScript" +initializeevents EQUS "InitializeEventsScript" +asknumber1m EQUS "AskNumber1MScript" +asknumber2m EQUS "AskNumber2MScript" +registerednumberm EQUS "RegisteredNumberMScript" +numberacceptedm EQUS "NumberAcceptedMScript" +numberdeclinedm EQUS "NumberDeclinedMScript" +phonefullm EQUS "PhoneFullMScript" +rematchm EQUS "RematchMScript" +giftm EQUS "GiftMScript" +packfullm EQUS "PackFullMScript" +rematchgiftm EQUS "RematchGiftMScript" +asknumber1f EQUS "AskNumber1FScript" +asknumber2f EQUS "AskNumber2FScript" +registerednumberf EQUS "RegisteredNumberFScript" +numberacceptedf EQUS "NumberAcceptedFScript" +numberdeclinedf EQUS "NumberDeclinedFScript" +phonefullf EQUS "PhoneFullFScript" +rematchf EQUS "RematchFScript" +giftf EQUS "GiftFScript" +packfullf EQUS "PackFullFScript" +rematchgiftf EQUS "RematchGiftFScript" +gymstatue1 EQUS "GymStatue1Script" +gymstatue2 EQUS "GymStatue2Script" +receiveitem EQUS "ReceiveItemScript" +receivetogepiegg EQUS "ReceiveTogepiEggScript" +pcscript EQUS "PCScript" +gamecornercoinvendor EQUS "GameCornerCoinVendorScript" +happinesschecknpc EQUS "HappinessCheckScript" diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index b7aa1a1fb..6082c6b13 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -80,13 +80,13 @@ ENDM enum jumpstd_command ; $0c jumpstd: MACRO db jumpstd_command - dw \1 ; predefined_script + dw (\1StdScript - StdScripts) / 3 ENDM enum callstd_command ; $0d callstd: MACRO db callstd_command - dw \1 ; predefined_script + dw (\1StdScript - StdScripts) / 3 ENDM enum callasm_command ; $0e diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index b119d9239..bbfd4ea9d 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -62,10 +62,10 @@ AzaleaGymActivateRockets: end .GoldenrodRockets: - jumpstd goldenrodrockets + jumpstd GoldenrodRocketsScript .RadioTowerRockets: - jumpstd radiotowerrockets + jumpstd RadioTowerRocketsScript TrainerTwinsAmyandmay1: trainer TWINS, AMYANDMAY1, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript @@ -142,10 +142,10 @@ AzaleaGymGuyScript: AzaleaGymStatue: checkflag ENGINE_HIVEBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, BUGSY, BUGSY1 - jumpstd gymstatue2 + jumpstd GymStatue2Script BugsyText_INeverLose: text "I'm BUGSY!" diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index 7ea58a927..b4b7e0405 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -14,7 +14,7 @@ AzaleaPokecenter1F_MapScripts: end AzaleaPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript AzaleaPokecenter1FGentlemanScript: jumptextfaceplayer AzaleaPokecenter1FGentlemanText diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 6fdd2e1a4..827426bed 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -200,10 +200,10 @@ AzaleaTownIlextForestSign: jumptext AzaleaTownIlexForestSignText AzaleaTownPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript AzaleaTownMartSign: - jumpstd martsign + jumpstd MartSignScript WhiteApricornTree: fruittree FRUITTREE_AZALEA_TOWN diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index 9dd90f668..ba36a9876 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -98,13 +98,13 @@ BillsSisterScript: sjump .Refused BillsHouseBookshelf1: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript BillsHouseBookshelf2: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript BillsHouseRadio: - jumpstd radio2 + jumpstd Radio2Script BillTakeThisEeveeText: text "BILL: Hi, <PLAYER>!" diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 32e9e3ce4..e68bed88d 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -137,10 +137,10 @@ BlackthornCityTrainerTips: jumptext BlackthornCityTrainerTipsText BlackthornCityPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript BlackthornCityMartSign: - jumpstd martsign + jumpstd MartSignScript Text_ClairIsOut: text "I am sorry." diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index cecbdcc61..a4773cbb9 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -20,11 +20,11 @@ BlackthornDragonSpeechHouseDratiniScript: ; unused BlackthornDragonSpeechHousePictureBookshelf: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript ; unused BlackthornDragonSpeechHouseMagazineBookshelf: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript BlackthornDragonSpeechHouseGrannyText: text "A clan of trainers" diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index f59ef4b8a..5ecca7df2 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -15,7 +15,7 @@ Emy: end EmysHouseBookshelf: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript BlackthornEmysHouse_MapEvents: db 0, 0 ; filler diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 1a9f6f2ae..9dbf9955a 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -142,10 +142,10 @@ BlackthornGymGuyScript: BlackthornGymStatue: checkflag ENGINE_RISINGBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, CLAIR, CLAIR1 - jumpstd gymstatue2 + jumpstd GymStatue2Script ClairIntroText: text "I am CLAIR." diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 6d5997038..0a23d5f18 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -54,7 +54,7 @@ BlackthornGym2F_MapScripts: end BlackthornGymBoulder: - jumpstd strengthboulder + jumpstd StrengthBoulderScript TrainerCooltrainermCody: trainer COOLTRAINERM, CODY, EVENT_BEAT_COOLTRAINERM_CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index 530736ddf..de3ea5c8f 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -10,7 +10,7 @@ BlackthornPokecenter1F_MapScripts: db 0 ; callbacks BlackthornPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript BlackthornPokecenter1FGentlemanScript: jumptextfaceplayer BlackthornPokecenter1FGentlemanText @@ -19,7 +19,7 @@ BlackthornPokecenter1FTwinScript: jumptextfaceplayer BlackthornPokecenter1FTwinText BlackthornPokecenter1FCooltrainerMScript: - jumpstd happinesschecknpc + jumpstd HappinessCheckScript BlackthornPokecenter1FGentlemanText: text "Deep inside far-" diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 846b4621d..cb5daee2c 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -126,7 +126,7 @@ BurnedTower1FMortyScript: jumptextfaceplayer BurnedTower1FMortyText BurnedTower1FRock: - jumpstd smashrock + jumpstd SmashRockScript BurnedTower1FHiddenEther: hiddenitem ETHER, EVENT_BURNED_TOWER_1F_HIDDEN_ETHER diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index bf06be788..c8675f73b 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -120,7 +120,7 @@ BurnedTowerB1FTMEndure: itemball TM_ENDURE BurnedTowerB1FBoulder: - jumpstd strengthboulder + jumpstd StrengthBoulderScript BurnedTowerRaikouMovement: set_sliding diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 5d834b710..e006ee114 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -114,7 +114,7 @@ CeladonCafeTrashcan: end .TrashEmpty: - jumpstd trashcan + jumpstd TrashCanScript ChefText_Eatathon: text "Hi!" diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 3a7366ead..9c74a04c6 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -70,7 +70,7 @@ CeladonCityTrainerTips: jumptext CeladonCityTrainerTipsText CeladonCityPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript CeladonCityHiddenPpUp: hiddenitem PP_UP, EVENT_CELADON_CITY_HIDDEN_PP_UP diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 90f102728..d7fa08c93 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -21,7 +21,7 @@ CeladonDeptStore1FDirectory: jumptext CeladonDeptStore1FDirectoryText CeladonDeptStore1FElevatorButton: - jumpstd elevatorbutton + jumpstd ElevatorButtonScript CeladonDeptStore1FReceptionistText: text "Hello! Welcome to" diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index b83d4cfad..2339c075f 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -33,7 +33,7 @@ CeladonDeptStore2FDirectory: jumptext CeladonDeptStore2FDirectoryText CeladonDeptStore2FElevatorButton: - jumpstd elevatorbutton + jumpstd ElevatorButtonScript CeladonDeptStore2FPokefanMText: text "I just recently" diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 4fd72c8c8..70522767a 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -42,7 +42,7 @@ CeladonDeptStore3FSuperNerdScript: jumptextfaceplayer CeladonDeptStore3FSuperNerdText CeladonDeptStore3FElevatorButton: - jumpstd elevatorbutton + jumpstd ElevatorButtonScript CeladonDeptStore3FDirectory: jumptext CeladonDeptStore3FDirectoryText diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 8c6f1c647..645ce8287 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -25,7 +25,7 @@ CeladonDeptStore4FDirectory: jumptext CeladonDeptStore4FDirectoryText CeladonDeptStore4FElevatorButton: - jumpstd elevatorbutton + jumpstd ElevatorButtonScript CeladonDeptStore4FSuperNerdText: text "I'm here to buy" diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 7704d9422..55cf121f9 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -37,7 +37,7 @@ CeladonDeptStore5FDirectory: jumptext CeladonDeptStore5FDirectoryText CeladonDeptStore5FElevatorButton: - jumpstd elevatorbutton + jumpstd ElevatorButtonScript CeladonDeptStore5FGentlemanText: text "I want to buy some" diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index f9f690703..3ea9b97eb 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -100,7 +100,7 @@ CeladonDeptStore6FDirectory: ; unused CeladonDeptStore6FElevatorButton: - jumpstd elevatorbutton + jumpstd ElevatorButtonScript CeladonVendingText: text "A vending machine!" diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 8465e2e44..1ab8395b1 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -15,7 +15,7 @@ CeladonGameCorner_MapScripts: db 0 ; callbacks CeladonGameCornerClerkScript: - jumpstd gamecornercoinvendor + jumpstd GameCornerCoinVendorScript CeladonGameCornerReceptionistScript: jumptextfaceplayer CeladonGameCornerReceptionistText @@ -70,7 +70,7 @@ CeladonGameCornerFisherScript: end .GiveCoins: - jumpstd receiveitem + jumpstd ReceiveItemScript end .coinname diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 60a32e3bb..4d65ea229 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -105,10 +105,10 @@ TrainerTwinsJoAndZoe2: CeladonGymStatue: checkflag ENGINE_RAINBOWBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, ERIKA, ERIKA1 - jumpstd gymstatue2 + jumpstd GymStatue2Script ErikaBeforeBattleText: text "ERIKA: Hello…" diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index edadecedf..56efc6964 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -40,7 +40,7 @@ CeladonMansionManagersSuiteSign: jumptext CeladonMansionManagersSuiteSignText CeladonMansion1FBookshelf: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript CeladonMansionManagerText: text "My dear #MON" diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index 316a16f25..e2c97fdf8 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -10,7 +10,7 @@ CeladonMansion2FMeetingRoomSign: jumptext CeladonMansion2FMeetingRoomSignText CeladonMansion2FBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript CeladonMansion2FComputerText: text "<PLAYER> turned on" diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 380f04fa5..0608b5940 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -11,10 +11,10 @@ CeladonPokecenter1F_MapScripts: db 0 ; callbacks CeladonPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript CeladonPokecenter1FGentlemanScript: - jumpstd happinesschecknpc + jumpstd HappinessCheckScript CeladonPokecenter1FCooltrainerFScript: jumptextfaceplayer CeladonPokecenter1FCooltrainerFText diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 989602102..7fcc8b9ff 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -139,10 +139,10 @@ CeruleanLockedDoor: jumptext CeruleanLockedDoorText CeruleanCityPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript CeruleanCityMartSign: - jumpstd martsign + jumpstd MartSignScript CeruleanCityHiddenBerserkGene: hiddenitem BERSERK_GENE, EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index aa2fee465..58a999f4d 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -156,10 +156,10 @@ CeruleanGymStatue2: CeruleanGymStatue: checkflag ENGINE_CASCADEBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, MISTY, MISTY1 - jumpstd gymstatue2 + jumpstd GymStatue2Script CeruleanGymGruntRunsDownMovement: big_step DOWN diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 3f62449b2..b8cc80c52 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -9,7 +9,7 @@ CeruleanPokecenter1F_MapScripts: db 0 ; callbacks CeruleanPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript CeruleanPokecenter1FSuperNerdScript: special Mobile_DummyReturnFalse diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 69efe53d5..24fe8e373 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -70,10 +70,10 @@ CharcoalKilnFarfetchd: end CharcoalKilnBookshelf: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript CharcoalKilnRadio: - jumpstd radio2 + jumpstd Radio2Script CharcoalKilnBossText1: text "All the SLOWPOKE" diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 8acb76fbc..8be938f8f 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -86,7 +86,7 @@ CherrygroveCityGuideGent: end .JumpstdReceiveItem: - jumpstd receiveitem + jumpstd ReceiveItemScript end .mapcardname @@ -230,10 +230,10 @@ GuideGentsHouseSign: jumptext GuideGentsHouseSignText CherrygroveCityPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript CherrygroveCityMartSign: - jumpstd martsign + jumpstd MartSignScript GuideGentMovement1: step LEFT diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index 3612f3157..e367a7596 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -22,7 +22,7 @@ CherrygroveEvolutionSpeechHouseLassScript: end CherrygroveEvolutionSpeechHouseBookshelf: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript CherrygroveEvolutionSpeechHouseYoungsterText: text "#MON gain expe-" diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 28bf6153c..a6232bccd 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -14,7 +14,7 @@ CherrygroveGymSpeechHouseBugCatcherScript: jumptextfaceplayer CherrygroveGymSpeechHouseBugCatcherText CherrygroveGymSpeechHouseBookshelf: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript CherrygroveGymSpeechHousePokefanMText: text "You're trying to" diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index 60c6414ed..6aa16078d 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -10,7 +10,7 @@ CherrygrovePokecenter1F_MapScripts: db 0 ; callbacks CherrygrovePokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript CherrygrovePokecenter1FFisherScript: jumptextfaceplayer CherrygrovePokecenter1FFisherText diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 1805d7a78..93f97402f 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -138,10 +138,10 @@ CianwoodPokeSeerSign: jumptext CianwoodPokeSeerSignText CianwoodPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript CianwoodCityRock: - jumpstd smashrock + jumpstd SmashRockScript CianwoodCityHiddenRevive: hiddenitem REVIVE, EVENT_CIANWOOD_CITY_HIDDEN_REVIVE diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index f2dc1ec32..84401c78e 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -79,10 +79,10 @@ CianwoodGymActivateRockets: end .GoldenrodRockets: - jumpstd goldenrodrockets + jumpstd GoldenrodRocketsScript .RadioTowerRockets: - jumpstd radiotowerrockets + jumpstd RadioTowerRocketsScript TrainerBlackbeltYoshi: trainer BLACKBELT_T, YOSHI, EVENT_BEAT_BLACKBELT_YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script @@ -129,15 +129,15 @@ TrainerBlackbeltLung: end CianwoodGymBoulder: - jumpstd strengthboulder + jumpstd StrengthBoulderScript CianwoodGymStatue: checkflag ENGINE_STORMBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, CHUCK, CHUCK1 - jumpstd gymstatue2 + jumpstd GymStatue2Script CianwoodGymMovement_ChuckChucksBoulder: set_sliding diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 46b832ea7..7fa26baa1 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -18,7 +18,7 @@ CianwoodLugiaSpeechHouseTwinScript: jumptextfaceplayer CianwoodLugiaSpeechHouseTwinText CianwoodLugiaSpeechHouseBookshelf: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript CianwoodLugiaSpeechHouseTeacherText: text "You came from" diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index b55e3d07e..e8c2ad51a 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -36,7 +36,7 @@ CianwoodPharmacist: end CianwoodPharmacyBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript PharmacistGiveSecretpotionText: text "Your #MON ap-" diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index f894fde75..cdee2c8d7 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -10,7 +10,7 @@ CianwoodPokecenter1F_MapScripts: db 0 ; callbacks CianwoodPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript CianwoodPokecenter1FLassScript: jumptextfaceplayer CianwoodPokecenter1FLassText diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 0cd60316b..79e9a5cb1 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -30,7 +30,7 @@ CinnabarIslandSign: jumptext CinnabarIslandSignText CinnabarIslandPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript CinnabarIslandHiddenRareCandy: hiddenitem RARE_CANDY, EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index f6ca9554c..ac8f4432a 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -9,7 +9,7 @@ CinnabarPokecenter1F_MapScripts: db 0 ; callbacks CinnabarPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript CinnabarPokecenter1FCooltrainerFScript: jumptextfaceplayer CinnabarPokecenter1FCooltrainerFText diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index e3e1933e2..fc9153d49 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -184,7 +184,7 @@ CopycatsHouse2FDoll: jumptext CopycatsHouse2FDollText CopycatsHouse2FBookshelf: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript CopycatSpinAroundMovementData: turn_head DOWN diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index a5c6ecc33..6a8f6400c 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -26,7 +26,7 @@ DarkCaveVioletEntranceDireHit: itemball DIRE_HIT DarkCaveVioletEntranceRock: - jumpstd smashrock + jumpstd SmashRockScript DarkCaveVioletEntranceHiddenElixer: hiddenitem ELIXER, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 04458c37d..5fba0a541 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -71,7 +71,7 @@ DayCareLadyScript: end DayCareBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript Text_GrampsLookingForYou: text "Gramps was looking" diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index e06ca993f..696100f17 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -143,7 +143,7 @@ AcademyStickerMachine: jumptext AcademyStickerMachineText AcademyBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript AcademyEarlSpinMovement: turn_head DOWN diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 46acf910b..e942638bc 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -80,10 +80,10 @@ BurnedTowerSign: jumptext BurnedTowerSignText EcruteakCityPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript EcruteakCityMartSign: - jumpstd martsign + jumpstd MartSignScript EcruteakCityHiddenHyperPotion: hiddenitem HYPER_POTION, EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index ede295834..421f48fe2 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -74,10 +74,10 @@ EcruteakGymActivateRockets: end .GoldenrodRockets: - jumpstd goldenrodrockets + jumpstd GoldenrodRocketsScript .RadioTowerRockets: - jumpstd radiotowerrockets + jumpstd RadioTowerRocketsScript EcruteakGymClosed: applymovement PLAYER, EcruteakGymPlayerStepUpMovement @@ -158,10 +158,10 @@ EcruteakGymGuyScript: EcruteakGymStatue: checkflag ENGINE_FOGBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, MORTY, MORTY1 - jumpstd gymstatue2 + jumpstd GymStatue2Script EcruteakGymPlayerStepUpMovement: step UP diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 440d2d6ca..96140f997 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -53,7 +53,7 @@ EcruteakHistoryBook: end ItemFinderHouseRadio: - jumpstd radio2 + jumpstd Radio2Script EcruteakItemfinderAdventureText: text "Ah. You're on an" diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index cd93d0d04..4083a56de 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -14,7 +14,7 @@ EcruteakLugiaSpeechHouseYoungsterScript: jumptextfaceplayer EcruteakLugiaSpeechHouseYoungsterText LugiaSpeechHouseRadio: - jumpstd radio2 + jumpstd Radio2Script EcruteakLugiaSpeechHouseGrampsText: text "This happened when" diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index fd37aac6a..3ce7c1bb2 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -56,7 +56,7 @@ EcruteakPokecenter1F_MapScripts: end EcruteakPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript EcruteakPokecenter1FPokefanMScript: special Mobile_DummyReturnFalse diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index a191cd820..24a3ffd6a 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -17,7 +17,7 @@ ElmsHousePC: jumptext ElmsHousePCText ElmsHouseBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript ElmsWifeText: text "Hi, <PLAY_G>! My" diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index c8b84ccc6..cd6211c5c 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -509,7 +509,7 @@ AideScript_GiveYouBalls: end AideScript_ReceiveTheBalls: - jumpstd receiveitem + jumpstd ReceiveItemScript end ElmsAideScript: @@ -603,10 +603,10 @@ ElmsLabPC: ElmsLabTrashcan2: ; unused - jumpstd trashcan + jumpstd TrashCanScript ElmsLabBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript ElmsLab_WalkUpToElmMovement: step UP diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 1dd58e595..b10c1921b 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -202,7 +202,7 @@ TrainerSchoolboyRicky: end FastShipB1FTrashcan: - jumpstd trashcan + jumpstd TrashCanScript FastShipB1FSailorBlocksRightMovement: fix_facing diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 48aaf9d7b..6f4435bcc 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -113,7 +113,7 @@ FastShipLazySailorScript: end FastShipCabins_NNW_NNE_NETrashcan: - jumpstd trashcan + jumpstd TrashCanScript FastShipLazySailorLeavesMovement1: step LEFT diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 0d0a41cfc..00d7af45c 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -216,7 +216,7 @@ TrainerSupernerdShawn: end FastShipCaptainsCabinTrashcan: - jumpstd trashcan + jumpstd TrashCanScript MovementData_0x76004: big_step RIGHT diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 955de02fb..7cde60b2b 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -109,7 +109,7 @@ FastShipBed: end FastShipCabinsNorthwestCabinTrashcan: - jumpstd trashcan + jumpstd TrashCanScript FirebreatherLyleSeenText: text "I'm going to KANTO" diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index e5a96e9f6..79c9125c9 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -42,10 +42,10 @@ NoLitteringSign: jumptext NoLitteringSignText FuchsiaCityPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript FuchsiaCityMartSign: - jumpstd martsign + jumpstd MartSignScript FuchsiaCityFruitTree: fruittree FRUITTREE_FUCHSIA_CITY diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 7b155c591..e860f8a81 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -212,10 +212,10 @@ FuchsiaGymGuyScript: FuchsiaGymStatue: checkflag ENGINE_SOULBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, JANINE, JANINE1 - jumpstd gymstatue2 + jumpstd GymStatue2Script Movement_NinjaSpin: turn_head DOWN diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 8dad06da2..4c9336d90 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -14,7 +14,7 @@ FuchsiaPokecenter1F_MapScripts: end FuchsiaPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript FuchsiaPokecenter1FCooltrainerMScript: jumptextfaceplayer FuchsiaPokecenter1FCooltrainerMText diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index d18b818f6..382bbbef1 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -262,7 +262,7 @@ GoldenrodCityUndergroundSignSouth: jumptext GoldenrodCityUndergroundSignSouthText GoldenrodCityPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript GoldenrodCityFlowerShopSign: jumptext GoldenrodCityFlowerShopSignText diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 608f96fb6..707ef22ed 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -25,7 +25,7 @@ GoldenrodDeptStore1FDirectory: jumptext GoldenrodDeptStore1FDirectoryText GoldenrodDeptStore1FElevatorButton: - jumpstd elevatorbutton + jumpstd ElevatorButtonScript GoldenrodDeptStore1FReceptionistText: text "Welcome to GOLDEN-" diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index 819af5a83..d409e6173 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -37,7 +37,7 @@ GoldenrodDeptStore2FDirectory: jumptext GoldenrodDeptStore2FDirectoryText GoldenrodDeptStore2FElevatorButton: - jumpstd elevatorbutton + jumpstd ElevatorButtonScript GoldenrodDeptStore2FUnusedText1: ; unused diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index d76f87fa8..683339bf9 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -25,7 +25,7 @@ GoldenrodDeptStore3FDirectory: jumptext GoldenrodDeptStore3FDirectoryText GoldenrodDeptStore3FElevatorButton: - jumpstd elevatorbutton + jumpstd ElevatorButtonScript GoldenrodDeptStore3FSuperNerdText: text "I, I, I'm really" diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 655cfbbbf..baad0b78d 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -35,7 +35,7 @@ GoldenrodDeptStore4FDirectory: jumptext GoldenrodDeptStore4FDirectoryText GoldenrodDeptStore4FElevatorButton: - jumpstd elevatorbutton + jumpstd ElevatorButtonScript GoldenrodDeptStore4FCooltrainerMText: text "Hey. I love strong" diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index eda75e151..d07e6e48a 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -136,7 +136,7 @@ GoldenrodDeptStore5FDirectory: jumptext GoldenrodDeptStore5FDirectoryText GoldenrodDeptStore5FElevatorButton: - jumpstd elevatorbutton + jumpstd ElevatorButtonScript GoldenrodDeptStore5FReceptionistOhYourMonDotDotDotText: text "Hello. Oh, your" diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index c8173e1d9..b2a223060 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -94,7 +94,7 @@ GoldenrodDeptStore6FDirectory: jumptext GoldenrodDeptStore6FDirectoryText GoldenrodDeptStore6FElevatorButton: - jumpstd elevatorbutton + jumpstd ElevatorButtonScript GoldenrodVendingText: text "A vending machine!" diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index ff49d255a..863c0a9a6 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -75,15 +75,15 @@ FlowerShopFloriaScript: FlowerShopShelf1: ; unused - jumpstd picturebookshelf + jumpstd PictureBookshelfScript FlowerShopShelf2: ; unused - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript FlowerShopRadio: ; unused - jumpstd radio2 + jumpstd Radio2Script GoldenrodFlowerShopTeacherMySisterWentToSeeWigglyTreeRoute36Text: text "Have you seen that" diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 1381b22db..ff7f3c633 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -54,7 +54,7 @@ MoveTutorInsideScript: end GoldenrodGameCornerCoinVendorScript: - jumpstd gamecornercoinvendor + jumpstd GameCornerCoinVendorScript GoldenrodGameCornerTMVendorScript: faceplayer diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 9c3872edc..49faf9e72 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -85,10 +85,10 @@ GoldenrodGymActivateRockets: end .GoldenrodRockets: - jumpstd goldenrodrockets + jumpstd GoldenrodRocketsScript .RadioTowerRockets: - jumpstd radiotowerrockets + jumpstd RadioTowerRocketsScript TrainerLassCarrie: trainer LASS, CARRIE, EVENT_BEAT_LASS_CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script @@ -167,10 +167,10 @@ GoldenrodGymGuyScript: GoldenrodGymStatue: checkflag ENGINE_PLAINBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, WHITNEY, WHITNEY1 - jumpstd gymstatue2 + jumpstd GymStatue2Script BridgetWalksUpMovement: step LEFT diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 5958c1811..18068b3cd 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -64,10 +64,10 @@ GoldenrodHappinessRaterTwinScript: jumptextfaceplayer GoldenrodHappinessRaterTwinText HappinessRatersHouseBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript HappinessRatersHouseRadio: - jumpstd radio2 + jumpstd Radio2Script GoldenrodHappinessRaterTeacherText: text "If you treat your" diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index a6f12354e..283cdeb27 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -15,10 +15,10 @@ GoldenrodNameRater: end GoldenrodNameRaterBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript GoldenrodNameRaterRadio: - jumpstd radio2 + jumpstd Radio2Script INCLUDE "data/text/unused_sweet_honey.asm" diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index fc6642707..584477c58 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -14,13 +14,13 @@ GoldenrodPPSpeechHouseLassScript: jumptextfaceplayer GoldenrodPPSpeechHouseLassText GoldenrodPPSpeechHouseBookshelf2: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript GoldenrodPPSpeechHouseBookshelf1: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript GoldenrodPPSpeechHouseRadio: - jumpstd radio2 + jumpstd Radio2Script GoldenrodPPSpeechHouseFisherText: text "Once while I was" diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index da0b1f7fc..7c736143a 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -11,7 +11,7 @@ GoldenrodPokecenter1F_MapScripts: db 0 ; callbacks GoldenrodPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript GoldenrodPokecenter1F_GSBallSceneLeft: setval BATTLETOWERACTION_CHECKMOBILEEVENT diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 0fd391ce9..91fdb6a6e 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -10,7 +10,7 @@ GuideGentsHouseGuideGent: jumptextfaceplayer GuideGentsHouseGuideGentText GuideGentsHouseBookshelf: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript GuideGentsHouseGuideGentText: text "When I was a wee" diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index d4590801b..9c3951a99 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -60,7 +60,7 @@ IcePathB1F_MapScripts: end IcePathB1FBoulder: - jumpstd strengthboulder + jumpstd StrengthBoulderScript IcePathB1FIron: itemball IRON diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index c35fd4547..b361dc863 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -11,7 +11,7 @@ IcePathB3FNevermeltice: itemball NEVERMELTICE IcePathB3FRock: - jumpstd smashrock + jumpstd SmashRockScript IcePathB3F_MapEvents: db 0, 0 ; filler diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index cb41f0fc0..d5bf0888b 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -422,7 +422,7 @@ IlexForestHiddenFullHeal: IlexForestBoulder: ; unused - jumpstd strengthboulder + jumpstd StrengthBoulderScript IlexForestSignpost: jumptext IlexForestSignpostText diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index c5cf3c57a..6594aee5e 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -135,7 +135,7 @@ PlateauRivalScriptDone: end IndigoPlateauPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript IndigoPlateauPokecenter1FClerkScript: opentext diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 167a0c18f..e55b49f5a 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -426,10 +426,10 @@ KurtsHouseCelebiStatue: jumptext KurtsHouseCelebiStatueText KurtsHouseBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript KurtsHouseRadio: - jumpstd radio2 + jumpstd Radio2Script KurtsHouseKurtExitHouseMovement: big_step DOWN diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 20e4a5601..dc3f75925 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -28,7 +28,7 @@ HiddenPowerGuy: end HiddenPowerHouseBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript HiddenPowerGuyText1: text "…You have strayed" diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index c7149281c..648afb0b3 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -88,7 +88,7 @@ LakeOfRageMagikarpHouseUnusedRecordSign: jumptext LakeOfRageMagikarpHouseUnusedRecordText MagikarpHouseBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript MagikarpLengthRaterText_LakeOfRageHistory: text "LAKE OF RAGE is" diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 1540fa444..188fb11f8 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -44,7 +44,7 @@ LavRadioTower1FGentlemanScript: end .receiveitem: - jumpstd receiveitem + jumpstd ReceiveItemScript end .expncardname diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 333011a58..bff586aa6 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -20,7 +20,7 @@ LavenderNameRater: LavenderNameRaterUnusedBookshelf: ; unused - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript LavenderNameRater_MapEvents: db 0, 0 ; filler diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index eb448e86d..31b1724f2 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -10,7 +10,7 @@ LavenderPokecenter1F_MapScripts: db 0 ; callbacks LavenderPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript LavenderPokecenter1FGentlemanScript: jumptextfaceplayer LavenderPokecenter1FGentlemanText diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index 7d43c2b96..1be5c7edb 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -10,7 +10,7 @@ LavenderSpeechHousePokefanFScript: jumptextfaceplayer LavenderSpeechHousePokefanFText LavenderSpeechHouseBookshelf: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript LavenderSpeechHousePokefanFText: text "LAVENDER is a" diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 5beb0fec1..a1eda99c8 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -39,10 +39,10 @@ SoulHouseSign: jumptext SoulHouseSignText LavenderPokecenterSignText: - jumpstd pokecentersign + jumpstd PokecenterSignScript LavenderMartSignText: - jumpstd martsign + jumpstd MartSignScript LavenderTownPokefanMText: text "That's quite some" diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index cb49e16a6..b92338f9c 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -63,10 +63,10 @@ MahoganyGymActivateRockets: end .GoldenrodRockets: - jumpstd goldenrodrockets + jumpstd GoldenrodRocketsScript .RadioTowerRockets: - jumpstd radiotowerrockets + jumpstd RadioTowerRocketsScript TrainerSkierRoxanne: trainer SKIER, ROXANNE, EVENT_BEAT_SKIER_ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script @@ -142,10 +142,10 @@ MahoganyGymGuyScript: MahoganyGymStatue: checkflag ENGINE_GLACIERBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, PRYCE, PRYCE1 - jumpstd gymstatue2 + jumpstd GymStatue2Script PryceText_Intro: text "#MON have many" diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index 8e5666c86..8459eff3f 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -10,7 +10,7 @@ MahoganyPokecenter1F_MapScripts: db 0 ; callbacks MahoganyPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript MahoganyPokecenter1FPokefanMScript: jumptextfaceplayer MahoganyPokecenter1FPokefanMText diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 71c1aa5a2..33e76ec3e 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -28,11 +28,11 @@ MahoganyRedGyaradosSpeechHouseTeacherScript: MahoganyRedGyaradosSpeechHouseUnusedBookshelf1: ; unused - jumpstd picturebookshelf + jumpstd PictureBookshelfScript MahoganyRedGyaradosSpeechHouseUnusedBookshelf2: ; unused - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript MahoganyRedGyaradosSpeechHouseBlackBeltText: text "I heard that a red" diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 762b7e59c..f02f059df 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -119,7 +119,7 @@ MahoganyGymSign: jumptext MahoganyGymSignText MahoganyTownPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript MovementData_0x1900a4: step DOWN diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 233acd17e..b390051e4 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -97,7 +97,7 @@ ManiaScript: ManiasHouseUnusedBookshelf: ; unused - jumpstd picturebookshelf + jumpstd PictureBookshelfScript ManiaText_AskLookAfterShuckle: text "I, I'm in shock!" diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 8d601fd71..0e49c0a0f 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -79,7 +79,7 @@ DontLitterSign: jumptext DontLitterSignText MtMoonSquareRock: - jumpstd smashrock + jumpstd SmashRockScript PlayerWalksUpToDancingClefairies: step UP diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index a92612147..fbbda22f8 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -38,7 +38,7 @@ TrainerSupernerdMarkus: end MountMortar1FBoulder: - jumpstd strengthboulder + jumpstd StrengthBoulderScript MountMortar1FInsideEscapeRope: itemball ESCAPE_ROPE diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 41e1b3be7..ccff6f6b7 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -52,7 +52,7 @@ MountMortarB1FKiyoScript: end MountMortarB1FBoulder: - jumpstd strengthboulder + jumpstd StrengthBoulderScript MountMortarB1FHyperPotion: itemball HYPER_POTION diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 3fe4d378c..1e9f0849f 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -15,7 +15,7 @@ MoveDeleter: end MoveDeletersHouseBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript MoveDeletersHouse_MapEvents: db 0, 0 ; filler diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index d1edd1581..40812e704 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -41,7 +41,7 @@ MrFujisPidgey: end MrFujisHouseBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript MrFujisHouseSuperNerdText: text "MR.FUJI does live" diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index b1beec7fa..35218ee6f 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -24,7 +24,7 @@ MrPsychic: end MrPsychicsHouseBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript MrPsychicText1: text "…" diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 33502ac89..2e0502037 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -159,31 +159,31 @@ TrainerSchoolboyJack1: end .AskNumber1: - jumpstd asknumber1m + jumpstd AskNumber1MScript end .AskNumber2: - jumpstd asknumber2m + jumpstd AskNumber2MScript end .RegisteredNumber: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end .NumberAccepted: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end .NumberDeclined: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end .PhoneFull: - jumpstd phonefullm + jumpstd PhoneFullMScript end .RematchStd: - jumpstd rematchm + jumpstd RematchMScript end TrainerPokefanmWilliam: @@ -245,35 +245,35 @@ TrainerPokefanfBeverly1: end .AskNumber1: - jumpstd asknumber1f + jumpstd AskNumber1FScript end .AskNumber2: - jumpstd asknumber2f + jumpstd AskNumber2FScript end .RegisteredNumber: - jumpstd registerednumberf + jumpstd RegisteredNumberFScript end .NumberAccepted: - jumpstd numberacceptedf + jumpstd NumberAcceptedFScript end .NumberDeclined: - jumpstd numberdeclinedf + jumpstd NumberDeclinedFScript end .PhoneFull: - jumpstd phonefullf + jumpstd PhoneFullFScript end .Gift: - jumpstd giftf + jumpstd GiftFScript end .PackFull: - jumpstd packfullf + jumpstd PackFullFScript end TrainerLassKrise: diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 199ccd5a4..a6a2539e6 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -63,7 +63,7 @@ OaksAssistant3Script: jumptextfaceplayer OaksAssistant3Text OaksLabBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript OaksLabPoster1: jumptext OaksLabPoster1Text diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index c8f4bb846..114442af7 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -108,10 +108,10 @@ OlivineCityBattleTowerSign: jumptext OlivineCityBattleTowerSignText OlivineCityPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript OlivineCityMartSign: - jumpstd martsign + jumpstd MartSignScript MovementData_0x1a88d2: step DOWN diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 33a57ec4e..511d3c6e4 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -37,7 +37,7 @@ GoodRodGuru: GoodRodHouseBookshelf: ; unused - jumpstd picturebookshelf + jumpstd PictureBookshelfScript OfferGoodRodText: text "OLIVINE is on the" diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 694aecd3c..b9d1258bc 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -53,10 +53,10 @@ OlivineGymActivateRockets: end .GoldenrodRockets: - jumpstd goldenrodrockets + jumpstd GoldenrodRocketsScript .RadioTowerRockets: - jumpstd radiotowerrockets + jumpstd RadioTowerRocketsScript OlivineGymGuyScript: faceplayer @@ -87,10 +87,10 @@ OlivineGymGuyScript: OlivineGymStatue: checkflag ENGINE_MINERALBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, JASMINE, JASMINE1 - jumpstd gymstatue2 + jumpstd GymStatue2Script Jasmine_SteelTypeIntro: text "…Thank you for" diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 57709db7b..3b197da3b 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -19,10 +19,10 @@ OlivineHouseBetaRhydonScript: end OlivineHouseBetaBookshelf1: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript OlivineHouseBetaBookshelf2: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript OlivineHouseBetaTeacherText: text "When my #MON" diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index b1a718fd0..dd0caad99 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -115,40 +115,40 @@ TrainerSailorHuey: sjump .NumberAccepted .AskNumber1: - jumpstd asknumber1m + jumpstd AskNumber1MScript end .AskNumber2: - jumpstd asknumber2m + jumpstd AskNumber2MScript end .RegisteredNumber: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end .NumberAccepted: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end .NumberDeclined: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end .PhoneFull: - jumpstd phonefullm + jumpstd PhoneFullMScript end .Rematch: - jumpstd rematchm + jumpstd RematchMScript end .PackFull: setevent EVENT_HUEY_PROTEIN - jumpstd packfullm + jumpstd PackFullMScript end .RematchGift: - jumpstd rematchgiftm + jumpstd RematchGiftMScript end SailorHueySeenText: diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index 8e9ef8ec6..cfcc153f2 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -10,10 +10,10 @@ OlivinePokecenter1F_MapScripts: db 0 ; callbacks OlivinePokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript OlivinePokecenter1FFishingGuruScript: - jumpstd happinesschecknpc + jumpstd HappinessCheckScript OlivinePokecenter1FFisherScript: jumptextfaceplayer OlivinePokecenter1FFisherText diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index c5309674e..ae80898f0 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -14,10 +14,10 @@ OlivinePunishmentSpeechHouseDaughter: jumptextfaceplayer OlivinePunishmentSpeechHouseDaughterText OlivinePunishmentSpeechHouseBookshelf2: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript OlivinePunishmentSpeechHouseBookshelf1: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript OlivinePunishmentSpeechHouseDadText: text "Along the way to" diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index aaa0689eb..9e9c0edaf 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -15,7 +15,7 @@ Tim: end TimsHouseBookshelf: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript OlivineTimsHouse_MapEvents: db 0, 0 ; filler diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 7a7f05b89..c507f6e16 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -55,10 +55,10 @@ PewterCityWelcomeSign: jumptext PewterCityWelcomeSignText PewterCityPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript PewterCityMartSign: - jumpstd martsign + jumpstd MartSignScript PewterCityFruitTree1: fruittree FRUITTREE_PEWTER_CITY_1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index cb0f52fef..90f85657d 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -68,10 +68,10 @@ PewterGymGuyScript: PewterGymStatue: checkflag ENGINE_BOULDERBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, BROCK, BROCK1 - jumpstd gymstatue2 + jumpstd GymStatue2Script BrockIntroText: text "BROCK: Wow, it's" diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index ddc053acc..06ae5b0de 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -11,7 +11,7 @@ PewterPokecenter1F_MapScripts: db 0 ; callbacks PewterPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript PewterPokecenter1FTeacherScript: jumptextfaceplayer PewterPokecenter1FTeacherText diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index f8d8fd082..6ac84910e 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -10,7 +10,7 @@ PewterSnoozeSpeechHouseGrampsScript: jumptextfaceplayer PewterSnoozeSpeechHouseGrampsText PewterSnoozeSpeechHouseBookshelf: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript PewterSnoozeSpeechHouseGrampsText: text "I like snoozing" diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index a2ba16d80..de60497a2 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -107,7 +107,7 @@ PokegearName: db "#GEAR@" PlayersHouse1FReceiveItemStd: - jumpstd receiveitem + jumpstd ReceiveItemScript end MomScript: diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 4ea22f8f8..4768b5ace 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -20,7 +20,7 @@ PlayersHouse2F_MapScripts: setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 checkevent EVENT_INITIALIZED_EVENTS iftrue .SkipInitialization - jumpstd initializeevents + jumpstd InitializeEventsScript return .SkipInitialization: @@ -71,7 +71,7 @@ PlayersHouseRadioScript: end .NormalRadio: - jumpstd radio1 + jumpstd Radio1Script .AbbreviatedRadio: opentext @@ -81,7 +81,7 @@ PlayersHouseRadioScript: end PlayersHouseBookshelfScript: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript PlayersHousePCScript: opentext diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm index 9122c29ef..d2b7138e3 100644 --- a/maps/PlayersNeighborsHouse.asm +++ b/maps/PlayersNeighborsHouse.asm @@ -14,7 +14,7 @@ PlayersNeighborScript: jumptextfaceplayer PlayersNeighborText PlayersNeighborsHouseBookshelfScript: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript PlayersNeighborsHouseRadioScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM @@ -36,7 +36,7 @@ PlayersNeighborsHouseRadioScript: setevent EVENT_LISTENED_TO_INITIAL_RADIO end .NormalRadio: - jumpstd radio1 + jumpstd Radio1Script .AbbreviatedRadio: opentext writetext PlayerNeighborRadioText4 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 8b8e4ac2c..e7ae7fa51 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -195,7 +195,7 @@ Forest: end PowerPlantBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript PowerPlantOfficer1ApproachGymGuy2Movement: step RIGHT diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 8e93e9161..baf03643a 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -161,7 +161,7 @@ RadioTower1FRadioCardWomanScript: db "RADIO CARD@" .ReceiveItem: - jumpstd receiveitem + jumpstd ReceiveItemScript end .WrongAnswer: diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 12e57af07..28c076cb4 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -335,7 +335,7 @@ RadioTower2FPokemonRadioSign: jumptext RadioTower2FPokemonRadioSignText RadioTower2FBookshelf: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript RadioTower2FPlayerWalksToMicrophoneMovement: slow_step DOWN diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 0a732e126..0b15d9792 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -149,7 +149,7 @@ RadioTower5FStudio1Sign: jumptext RadioTower5FStudio1SignText RadioTower5FBookshelf: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript FakeDirectorMovement: step LEFT diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 6e2324c64..17b8537a9 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -30,7 +30,7 @@ RedsHouse1FTV: jumptext RedsHouse1FTVText RedsHouse1FBookshelf: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript RedsMomText1: text "Hi!" diff --git a/maps/Route10North.asm b/maps/Route10North.asm index e04d646b7..4b22ac18c 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -7,7 +7,7 @@ PowerPlantSign: jumptext PowerPlantSignText Route10PokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript PowerPlantSignText: text "KANTO POWER PLANT" diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 11a0b3e67..edb4ec51f 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -10,7 +10,7 @@ Route10Pokecenter1F_MapScripts: db 0 ; callbacks Route10Pokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript Route10Pokecenter1FGentlemanScript: jumptextfaceplayer Route10Pokecenter1FGentlemanText diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 23ff65c86..1efe79911 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -34,7 +34,7 @@ Route12SuperRodHouseFishingGuruScript: SuperRodHouseBookshelf: ; unused - jumpstd picturebookshelf + jumpstd PictureBookshelfScript OfferSuperRodText: text "I'm the FISHING" diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index ccfd4232a..755d25ecc 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -10,7 +10,7 @@ Route16FuchsiaSpeechHouseSuperNerdScript: jumptextfaceplayer Route16FuchsiaSpeechHouseSuperNerdText Route16FuchsiaSpeechHouseBookshelf: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript Route16FuchsiaSpeechHouseSuperNerdText: text "If you cruise down" diff --git a/maps/Route26.asm b/maps/Route26.asm index 17ac2cfdc..17720caa4 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -90,31 +90,31 @@ TrainerCooltrainermGaven3: end .AskNumber1: - jumpstd asknumber1m + jumpstd AskNumber1MScript end .AskNumber2: - jumpstd asknumber2m + jumpstd AskNumber2MScript end .RegisteredNumber: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end .NumberAccepted: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end .NumberDeclined: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end .PhoneFull: - jumpstd phonefullm + jumpstd PhoneFullMScript end .Rematch: - jumpstd rematchm + jumpstd RematchMScript end TrainerCooltrainerfJoyce: @@ -194,31 +194,31 @@ TrainerCooltrainerfBeth1: end .AskNumber1: - jumpstd asknumber1f + jumpstd AskNumber1FScript end .AskNumber2: - jumpstd asknumber2f + jumpstd AskNumber2FScript end .RegisteredNumber: - jumpstd registerednumberf + jumpstd RegisteredNumberFScript end .NumberAccepted: - jumpstd numberacceptedf + jumpstd NumberAcceptedFScript end .NumberDeclined: - jumpstd numberdeclinedf + jumpstd NumberDeclinedFScript end .PhoneFull: - jumpstd phonefullf + jumpstd PhoneFullFScript end .Rematch: - jumpstd rematchf + jumpstd RematchFScript end TrainerPsychicRichard: diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index cdbcbf4cd..e3d35d12c 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -27,7 +27,7 @@ Route26HealHouseTeacherScript: end Route26HealHouseBookshelf: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript Route26HealHouseRestAWhileText: text "Your #MON look" diff --git a/maps/Route27.asm b/maps/Route27.asm index 7d65decf8..cbc171238 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -135,39 +135,39 @@ TrainerBirdKeeperJose2: sjump .PackFull .AskNumber1: - jumpstd asknumber1m + jumpstd AskNumber1MScript end .AskNumber2: - jumpstd asknumber2m + jumpstd AskNumber2MScript end .RegisteredNumber: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end .NumberAccepted: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end .NumberDeclined: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end .PhoneFull: - jumpstd phonefullm + jumpstd PhoneFullMScript end .Rematch: - jumpstd rematchm + jumpstd RematchMScript end .Gift: - jumpstd giftm + jumpstd GiftMScript end .PackFull: - jumpstd packfullm + jumpstd PackFullMScript end TrainerCooltrainermBlake: @@ -258,31 +258,31 @@ TrainerCooltrainerfReena: end .AskNumber1: - jumpstd asknumber1f + jumpstd AskNumber1FScript end .AskNumber2: - jumpstd asknumber2f + jumpstd AskNumber2FScript end .RegisteredNumber: - jumpstd registerednumberf + jumpstd RegisteredNumberFScript end .NumberAccepted: - jumpstd numberacceptedf + jumpstd NumberAcceptedFScript end .NumberDeclined: - jumpstd numberdeclinedf + jumpstd NumberDeclinedFScript end .PhoneFull: - jumpstd phonefullf + jumpstd PhoneFullFScript end .Rematch: - jumpstd rematchf + jumpstd RematchFScript end TrainerCooltrainerfMegan: diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 682663f08..ab6a03c45 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -37,7 +37,7 @@ SandstormHouseWoman: end SandstormHouseBookshelf: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript SandstormHouseWomanText1: text "Where are you off" diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm index 1d773b0a7..72f67e865 100644 --- a/maps/Route28SteelWingHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -39,7 +39,7 @@ CelebritysFearow: end CelebrityHouseBookshelf: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript CelebrityText1: text "Oh, dear." diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index 775b2b732..681ba49af 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -25,7 +25,7 @@ Route2NuggetHouseFisherScript: Route2NuggetHouseBookshelf: ; unused - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript Route2NuggetHouseFisherText: text "Hi! Wow, I'm glad" diff --git a/maps/Route30.asm b/maps/Route30.asm index 2a3f2a12e..58b8d4118 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -147,40 +147,40 @@ TrainerYoungsterJoey: sjump .NumberAccepted .AskNumber1: - jumpstd asknumber1m + jumpstd AskNumber1MScript end .AskNumber2: - jumpstd asknumber2m + jumpstd AskNumber2MScript end .RegisteredNumber: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end .NumberAccepted: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end .NumberDeclined: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end .PhoneFull: - jumpstd phonefullm + jumpstd PhoneFullMScript end .RematchStd: - jumpstd rematchm + jumpstd RematchMScript end .PackFull: setevent EVENT_JOEY_HP_UP - jumpstd packfullm + jumpstd PackFullMScript end .RematchGift: - jumpstd rematchgiftm + jumpstd RematchGiftMScript end TrainerYoungsterMikey: diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm index 81a115162..a996067a5 100644 --- a/maps/Route30BerryHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -24,7 +24,7 @@ Route30BerryHousePokefanMScript: end Route30BerryHouseBookshelf: - jumpstd magazinebookshelf + jumpstd MagazineBookshelfScript Route30BerrySpeechHouseMonEatBerriesText: text "You know, #MON" diff --git a/maps/Route31.asm b/maps/Route31.asm index 1b41db781..5e29ffc46 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -145,39 +145,39 @@ TrainerBugCatcherWade1: sjump .PackFullSTD .AskPhoneNumberSTD: - jumpstd asknumber1m + jumpstd AskNumber1MScript end .AskAgainSTD: - jumpstd asknumber2m + jumpstd AskNumber2MScript end .RegisterNumberSTD: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end .AcceptedNumberSTD: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end .DeclinedNumberSTD: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end .PhoneFullSTD: - jumpstd phonefullm + jumpstd PhoneFullMScript end .RematchSTD: - jumpstd rematchm + jumpstd RematchMScript end .ItemSTD: - jumpstd giftm + jumpstd GiftMScript end .PackFullSTD: - jumpstd packfullm + jumpstd PackFullMScript end Route31MailRecipientScript: diff --git a/maps/Route32.asm b/maps/Route32.asm index 03ba6e078..43c15d9fe 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -261,31 +261,31 @@ TrainerFisherRalph1: end .AskNumber1: - jumpstd asknumber1m + jumpstd AskNumber1MScript end .AskNumber2: - jumpstd asknumber2m + jumpstd AskNumber2MScript end .RegisteredNumber: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end .NumberAccepted: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end .NumberDeclined: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end .PhoneFull: - jumpstd phonefullm + jumpstd PhoneFullMScript end .RematchStd: - jumpstd rematchm + jumpstd RematchMScript end TrainerFisherHenry: @@ -389,31 +389,31 @@ TrainerPicnickerLiz1: end .AskNumber1: - jumpstd asknumber1f + jumpstd AskNumber1FScript end .AskNumber2: - jumpstd asknumber2f + jumpstd AskNumber2FScript end .RegisteredNumber: - jumpstd registerednumberf + jumpstd RegisteredNumberFScript end .NumberAccepted: - jumpstd numberacceptedf + jumpstd NumberAcceptedFScript end .NumberDeclined: - jumpstd numberdeclinedf + jumpstd NumberDeclinedFScript end .PhoneFull: - jumpstd phonefullf + jumpstd PhoneFullFScript end .RematchStd: - jumpstd rematchf + jumpstd RematchFScript end TrainerYoungsterAlbert: @@ -501,7 +501,7 @@ Route32UnionCaveSign: jumptext Route32UnionCaveSignText Route32PokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript Route32HiddenGreatBall: hiddenitem GREAT_BALL, EVENT_ROUTE_32_HIDDEN_GREAT_BALL diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 1d8d59aba..0ddb77895 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -9,7 +9,7 @@ Route32Pokecenter1F_MapScripts: db 0 ; callbacks Route32Pokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript Route32Pokecenter1FFishingGuruScript: faceplayer diff --git a/maps/Route33.asm b/maps/Route33.asm index 4b06dbcc8..d9c234e89 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -109,31 +109,31 @@ TrainerHikerAnthony: end .AskNumber1: - jumpstd asknumber1m + jumpstd AskNumber1MScript end .AskNumber2: - jumpstd asknumber2m + jumpstd AskNumber2MScript end .RegisteredNumber: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end .NumberAccepted: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end .NumberDeclined: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end .PhoneFull: - jumpstd phonefullm + jumpstd PhoneFullMScript end .RematchStd: - jumpstd rematchm + jumpstd RematchMScript end Route33Sign: diff --git a/maps/Route34.asm b/maps/Route34.asm index 49de65181..327772748 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -183,31 +183,31 @@ TrainerCamperTodd1: end .AskNumber: - jumpstd asknumber1m + jumpstd AskNumber1MScript end .AskNumber2: - jumpstd asknumber2m + jumpstd AskNumber2MScript end .RegisteredNumber: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end .NumberAccepted: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end .NumberDeclined: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end .PhoneFull: - jumpstd phonefullm + jumpstd PhoneFullMScript end .RematchStd: - jumpstd rematchm + jumpstd RematchMScript end TrainerPicnickerGina1: @@ -313,39 +313,39 @@ TrainerPicnickerGina1: sjump .PackFull .AskNumber1: - jumpstd asknumber1f + jumpstd AskNumber1FScript end .AskNumber2: - jumpstd asknumber2f + jumpstd AskNumber2FScript end .RegisteredNumber: - jumpstd registerednumberf + jumpstd RegisteredNumberFScript end .NumberAccepted: - jumpstd numberacceptedf + jumpstd NumberAcceptedFScript end .NumberDeclined: - jumpstd numberdeclinedf + jumpstd NumberDeclinedFScript end .PhoneFull: - jumpstd phonefullf + jumpstd PhoneFullFScript end .RematchStd: - jumpstd rematchf + jumpstd RematchFScript end .Gift: - jumpstd giftf + jumpstd GiftFScript end .PackFull: - jumpstd packfullf + jumpstd PackFullFScript end OfficerKeithScript: diff --git a/maps/Route35.asm b/maps/Route35.asm index 8e1dbde8f..19ec416ef 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -55,31 +55,31 @@ TrainerJugglerIrwin: sjump Route35NumberAcceptedM Route35AskNumber1M: - jumpstd asknumber1m + jumpstd AskNumber1MScript end Route35AskNumber2M: - jumpstd asknumber2m + jumpstd AskNumber2MScript end Route35RegisteredNumberM: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end Route35NumberAcceptedM: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end Route35NumberDeclinedM: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end Route35PhoneFullM: - jumpstd phonefullm + jumpstd PhoneFullMScript end Route35RematchM: - jumpstd rematchm + jumpstd RematchMScript end TrainerCamperIvan: diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 3ab43b039..52d7d8dde 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -64,7 +64,7 @@ Route35NationalParkGate_MapScripts: writetext Route35NationalParkGateOfficer1WaitAtNorthGateText waitbutton closetext - jumpstd bugcontestresultswarp + jumpstd BugContestResultsWarpScript .GoBackToContest: writetext Route35NationalParkGateOfficer1OkGoFinishText @@ -204,7 +204,7 @@ BugCatchingContestExplanationSign: jumptext BugCatchingContestExplanationText Route35NationalParkGate_GetDayOfWeek: - jumpstd daytotext + jumpstd DayToTextScript end Route35NationalParkGatePlayerApproachOfficer1Movement: diff --git a/maps/Route36.asm b/maps/Route36.asm index 9b5310fd3..35e838d01 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -267,39 +267,39 @@ TrainerSchoolboyAlan1: sjump .PackFull .AskNumber1: - jumpstd asknumber1m + jumpstd AskNumber1MScript end .AskNumber2: - jumpstd asknumber2m + jumpstd AskNumber2MScript end .RegisteredNumber: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end .NumberAccepted: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end .NumberDeclined: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end .PhoneFull: - jumpstd phonefullm + jumpstd PhoneFullMScript end .Rematch: - jumpstd rematchm + jumpstd RematchMScript end .Gift: - jumpstd giftm + jumpstd GiftMScript end .PackFull: - jumpstd packfullm + jumpstd PackFullMScript end TrainerPsychicMark: diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 9f0270b5a..58641c92c 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -81,7 +81,7 @@ Route36NationalParkGate_MapScripts: applymovement PLAYER, Route36NationalParkGatePlayerWaitWithContestantsMovement pause 15 special FadeInQuickly - jumpstd bugcontestresults + jumpstd BugContestResultsScript .GoBackToContest: writetext Route36NationalParkGateOfficer1OkGoFinishText @@ -300,7 +300,7 @@ Route36NationalParkGateOfficerScript: end Route36ParkGate_DayToText: - jumpstd daytotext + jumpstd DayToTextScript end BugCatchingContestant1BScript: diff --git a/maps/Route38.asm b/maps/Route38.asm index 9c4cbde52..619e25546 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -137,39 +137,39 @@ TrainerLassDana1: sjump .PackFull .AskNumber1F: - jumpstd asknumber1f + jumpstd AskNumber1FScript end .AskNumber2F: - jumpstd asknumber2f + jumpstd AskNumber2FScript end .RegisteredPhoneNumber: - jumpstd registerednumberf + jumpstd RegisteredNumberFScript end .NumberAccepted: - jumpstd numberacceptedf + jumpstd NumberAcceptedFScript end .DeclinedPhoneNumber: - jumpstd numberdeclinedf + jumpstd NumberDeclinedFScript end .PhoneFull: - jumpstd phonefullf + jumpstd PhoneFullFScript end .Rematch: - jumpstd rematchf + jumpstd RematchFScript end .Gift: - jumpstd giftf + jumpstd GiftFScript end .PackFull: - jumpstd packfullf + jumpstd PackFullFScript end TrainerSchoolboyChad1: @@ -262,31 +262,31 @@ TrainerSchoolboyChad1: end .AskPhoneNumber1: - jumpstd asknumber1m + jumpstd AskNumber1MScript end .AskPhoneNumber2: - jumpstd asknumber2m + jumpstd AskNumber2MScript end .RegisteredChad: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end .HaveChadsNumber: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end .SaidNo: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end .PhoneFull: - jumpstd phonefullm + jumpstd PhoneFullMScript end .Rematch: - jumpstd rematchm + jumpstd RematchMScript end TrainerBeautyValerie: diff --git a/maps/Route39.asm b/maps/Route39.asm index e3cdbce8b..650bf5079 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -71,35 +71,35 @@ TrainerPokefanmDerek: end .AskNumber1: - jumpstd asknumber1m + jumpstd AskNumber1MScript end .AskNumber2: - jumpstd asknumber2m + jumpstd AskNumber2MScript end .RegisteredNumber: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end .NumberAccepted: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end .NumberDeclined: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end .PhoneFull: - jumpstd phonefullm + jumpstd PhoneFullMScript end .Gift: - jumpstd giftm + jumpstd GiftMScript end .PackFull: - jumpstd packfullm + jumpstd PackFullMScript end TrainerPokefanfRuth: diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 76b294772..5f62637fe 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -91,7 +91,7 @@ FarmerFScript_NoRoomForSnore: end FarmhouseBookshelf: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript FarmerMText_SickCow: text "My MILTANK ain't" diff --git a/maps/Route40.asm b/maps/Route40.asm index e5d8258c9..224f90371 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -130,7 +130,7 @@ Route40Sign: jumptext Route40SignText Route40Rock: - jumpstd smashrock + jumpstd SmashRockScript Route40HiddenHyperPotion: hiddenitem HYPER_POTION, EVENT_ROUTE_40_HIDDEN_HYPER_POTION diff --git a/maps/Route41.asm b/maps/Route41.asm index 994a2b2ec..85fc32422 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -127,7 +127,7 @@ TrainerSwimmermMathew: Route41Rock: ; unused - jumpstd smashrock + jumpstd SmashRockScript Route41HiddenMaxEther: hiddenitem MAX_ETHER, EVENT_ROUTE_41_HIDDEN_MAX_ETHER diff --git a/maps/Route42.asm b/maps/Route42.asm index 3f9cf535e..1627a12a3 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -125,39 +125,39 @@ TrainerFisherTully: sjump .PackFull .AskNumber1: - jumpstd asknumber1m + jumpstd AskNumber1MScript end .AskNumber2: - jumpstd asknumber2m + jumpstd AskNumber2MScript end .RegisteredNumber: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end .NumberAccepted: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end .NumberDeclined: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end .PhoneFull: - jumpstd phonefullm + jumpstd PhoneFullMScript end .Rematch: - jumpstd rematchm + jumpstd RematchMScript end .Gift: - jumpstd giftm + jumpstd GiftMScript end .PackFull: - jumpstd packfullm + jumpstd PackFullMScript end TrainerPokemaniacShane: diff --git a/maps/Route43.asm b/maps/Route43.asm index 220f47293..d4b670e72 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -124,31 +124,31 @@ TrainerPokemaniacBrent: end .AskNumber1: - jumpstd asknumber1m + jumpstd AskNumber1MScript end .AskNumber2: - jumpstd asknumber2m + jumpstd AskNumber2MScript end .RegisteredNumber: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end .NumberAccepted: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end .NumberDeclined: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end .PhoneFull: - jumpstd phonefullm + jumpstd PhoneFullMScript end .Rematch: - jumpstd rematchm + jumpstd RematchMScript end TrainerPokemaniacRon: @@ -272,39 +272,39 @@ TrainerPicnickerTiffany: end .AskNumber1: - jumpstd asknumber1f + jumpstd AskNumber1FScript end .AskNumber2: - jumpstd asknumber2f + jumpstd AskNumber2FScript end .RegisteredNumber: - jumpstd registerednumberf + jumpstd RegisteredNumberFScript end .NumberAccepted: - jumpstd numberacceptedf + jumpstd NumberAcceptedFScript end .NumberDeclined: - jumpstd numberdeclinedf + jumpstd NumberDeclinedFScript end .PhoneFull: - jumpstd phonefullf + jumpstd PhoneFullFScript end .Rematch: - jumpstd rematchf + jumpstd RematchFScript end .Gift: - jumpstd giftf + jumpstd GiftFScript end .PackFull: - jumpstd packfullf + jumpstd PackFullFScript end Route43Sign1: diff --git a/maps/Route44.asm b/maps/Route44.asm index 4f9d5cb55..624709e5d 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -103,48 +103,48 @@ TrainerBirdKeeperVance1: sjump Route44NumberAcceptedM Route44AskNumber1M: - jumpstd asknumber1m + jumpstd AskNumber1MScript end Route44AskNumber2M: - jumpstd asknumber2m + jumpstd AskNumber2MScript end Route44RegisteredNumberM: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end Route44NumberAcceptedM: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end Route44NumberDeclinedM: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end Route44PhoneFullM: - jumpstd phonefullm + jumpstd PhoneFullMScript end Route44RematchM: - jumpstd rematchm + jumpstd RematchMScript end Route44GiftM: - jumpstd giftm + jumpstd GiftMScript end Route44PackFullM: - jumpstd packfullm + jumpstd PackFullMScript end VancePackFull: setevent EVENT_VANCE_CARBOS - jumpstd packfullm + jumpstd PackFullMScript end Route44RematchGiftM: - jumpstd rematchgiftm + jumpstd RematchGiftMScript end TrainerPsychicPhil: diff --git a/maps/Route45.asm b/maps/Route45.asm index 6806683cc..a4a962608 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -78,48 +78,48 @@ TrainerBlackbeltKenji: sjump Route45PackFullM Route45AskNumber1M: - jumpstd asknumber1m + jumpstd AskNumber1MScript end Route45AskNumber2M: - jumpstd asknumber2m + jumpstd AskNumber2MScript end Route45RegisteredNumberM: - jumpstd registerednumberm + jumpstd RegisteredNumberMScript end Route45NumberAcceptedM: - jumpstd numberacceptedm + jumpstd NumberAcceptedMScript end Route45NumberDeclinedM: - jumpstd numberdeclinedm + jumpstd NumberDeclinedMScript end Route45PhoneFullM: - jumpstd phonefullm + jumpstd PhoneFullMScript end Route45RematchM: - jumpstd rematchm + jumpstd RematchMScript end Route45GiftM: - jumpstd giftm + jumpstd GiftMScript end Route45PackFullM: - jumpstd packfullm + jumpstd PackFullMScript end HikerParryHasIron: setevent EVENT_PARRY_IRON - jumpstd packfullm + jumpstd PackFullMScript end Route45RematchGiftM: - jumpstd rematchgiftm + jumpstd RematchGiftMScript end TrainerHikerErik: diff --git a/maps/Route46.asm b/maps/Route46.asm index 6914048bb..3aac707a5 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -109,40 +109,40 @@ TrainerPicnickerErin1: sjump Route46NumberAcceptedF Route46AskNumber1F: - jumpstd asknumber1f + jumpstd AskNumber1FScript end Route46AskNumber2F: - jumpstd asknumber2f + jumpstd AskNumber2FScript end Route46RegisteredNumberF: - jumpstd registerednumberf + jumpstd RegisteredNumberFScript end Route46NumberAcceptedF: - jumpstd numberacceptedf + jumpstd NumberAcceptedFScript end Route46NumberDeclinedF: - jumpstd numberdeclinedf + jumpstd NumberDeclinedFScript end Route46PhoneFullF: - jumpstd phonefullf + jumpstd PhoneFullFScript end Route46RematchF: - jumpstd rematchf + jumpstd RematchFScript end ErinNoRoomForCalcium: setevent EVENT_ERIN_CALCIUM - jumpstd packfullf + jumpstd PackFullFScript end Route46RematchGiftF: - jumpstd rematchgiftf + jumpstd RematchGiftFScript end TrainerHikerBailey: diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm index ab4cdc034..5baa6c9a9 100644 --- a/maps/Route5CleanseTagHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -28,7 +28,7 @@ Route5CleanseTagHouseTeacherScript: jumptextfaceplayer Route5CleanseTagHouseTeacherText HouseForSaleBookshelf: - jumpstd difficultbookshelf + jumpstd DifficultBookshelfScript Route5CleanseTagHouseGrannyText1: text "Eeyaaaah!" diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 4dde5009b..eb442a813 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -29,7 +29,7 @@ SafariZonePhoto: jumptext SafariZonePhotoText WardensHomeBookshelf: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript WardensGranddaughterText1: text "My grandpa is the" diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 51da9178e..3914d4d25 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -100,10 +100,10 @@ SaffronCityMagnetTrainStationSign: jumptext SaffronCityMagnetTrainStationSignText SaffronCityPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript SaffronCityMartSign: - jumpstd martsign + jumpstd MartSignScript SaffronCityLass1Text: text "A little girl who" diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 4be260421..a2cf65fac 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -107,10 +107,10 @@ SaffronGymGuyScript: SaffronGymStatue: checkflag ENGINE_MARSHBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, SABRINA, SABRINA1 - jumpstd gymstatue2 + jumpstd GymStatue2Script SabrinaIntroText: text "SABRINA: I knew" diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 3e23f99b6..243f0452c 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -10,7 +10,7 @@ SaffronPokecenter1F_MapScripts: db 0 ; callbacks SaffronPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript SaffronPokecenter1FTeacherScript: special Mobile_DummyReturnFalse diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index fea256208..171468e08 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -9,7 +9,7 @@ SilverCaveOutside_MapScripts: return MtSilverPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript MtSilverSign: jumptext MtSilverSignText diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index 866e269a2..b3297234a 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -8,7 +8,7 @@ SilverCavePokecenter1F_MapScripts: db 0 ; callbacks SilverCavePokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript SilverCavePokecenter1FGrannyScript: jumptextfaceplayer SilverCavePokecenter1FGrannyText diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index f54ab4c4a..f498b2483 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -119,7 +119,7 @@ SlowpokeWellB1FTaillessSlowpokeScript: end SlowpokeWellB1FBoulder: - jumpstd strengthboulder + jumpstd StrengthBoulderScript SlowpokeWellB1FSuperPotion: itemball SUPER_POTION diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index d5cf1d38c..ba1370f9f 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -504,7 +504,7 @@ TeamRocketBaseB1FSecurityCamera: jumptext TeamRocketBaseB1FSecurityCameraText TeamRocketBaseB1FBookshelf: - jumpstd teamrocketoath + jumpstd TeamRocketOathScript TeamRocketBaseB1FSecretSwitch: opentext diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 1833357e1..100a3a539 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -200,7 +200,7 @@ TeamRocketBaseB3FLockedDoor: end TeamRocketBaseB3FOathScript: - jumpstd teamrocketoath + jumpstd TeamRocketOathScript TeamRocketBaseB3FProtein: itemball PROTEIN diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index f7412c055..dff3c2e0f 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -63,7 +63,7 @@ UnionCaveB1FXDefend: itemball X_DEFEND UnionCaveB1FBoulder: - jumpstd strengthboulder + jumpstd StrengthBoulderScript HikerPhillipSeenText: text "It's been a while" diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 101f73b38..46d70be67 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -115,10 +115,10 @@ VermilionCityPortSign: jumptext VermilionCityPortSignText VermilionCityPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript VermilionCityMartSign: - jumpstd martsign + jumpstd MartSignScript VermilionCityHiddenFullHeal: hiddenitem FULL_HEAL, EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index ed547b7f2..f1f9351a1 100644 --- a/maps/VermilionFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -14,7 +14,7 @@ FishingDudesHousePhoto: FishingDudesHouseBookshelf: ; unused - jumpstd picturebookshelf + jumpstd PictureBookshelfScript FishingDudeText: text "I am the FISHING" diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 79595660f..588fe18cd 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -97,10 +97,10 @@ VermilionGymTrashCan: VermilionGymStatue: checkflag ENGINE_THUNDERBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, LT_SURGE, LT_SURGE1 - jumpstd gymstatue2 + jumpstd GymStatue2Script LtSurgeIntroText: text "SURGE: Hey, you" diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index 0b87e3cd3..426aa6cfd 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -14,7 +14,7 @@ VermilionMagnetTrainSpeechHouseYoungsterScript: jumptextfaceplayer VermilionMagnetTrainSpeechHouseYoungsterText VermilionMagnetTrainSpeechHouseBookshelf: - jumpstd picturebookshelf + jumpstd PictureBookshelfScript VermilionMagnetTrainSpeechHousePokefanFText: text "Do you know about" diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index ffb09d70a..4a18e271c 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -10,7 +10,7 @@ VermilionPokecenter1F_MapScripts: db 0 ; callbacks VermilionPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript VermilionPokecenter1FFishingGuruScript: faceplayer diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 2a880da6a..0c97b0442 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -81,10 +81,10 @@ EarlsPokemonAcademySign: jumptext EarlsPokemonAcademySignText VioletCityPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript VioletCityMartSign: - jumpstd martsign + jumpstd MartSignScript VioletCityPPUp: itemball PP_UP diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 4a84a1dce..1af42534b 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -59,10 +59,10 @@ VioletGymActivateRockets: end .GoldenrodRockets: - jumpstd goldenrodrockets + jumpstd GoldenrodRocketsScript .RadioTowerRockets: - jumpstd radiotowerrockets + jumpstd RadioTowerRocketsScript TrainerBirdKeeperRod: trainer BIRD_KEEPER, ROD, EVENT_BEAT_BIRD_KEEPER_ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script @@ -105,10 +105,10 @@ VioletGymGuyScript: VioletGymStatue: checkflag ENGINE_ZEPHYRBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, FALKNER, FALKNER1 - jumpstd gymstatue2 + jumpstd GymStatue2Script FalknerIntroText: text "I'm FALKNER, the" diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 4558a4b47..afc901179 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -11,7 +11,7 @@ VioletPokecenter1F_MapScripts: db 0 ; callbacks VioletPokecenterNurse: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript VioletPokecenter1F_ElmsAideScript: faceplayer @@ -56,7 +56,7 @@ VioletPokecenter1F_ElmsAideScript: db "EGG@" .AideGivesEgg: - jumpstd receivetogepiegg + jumpstd ReceiveTogepiEggScript end .PartyFull: diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 47b51d7d6..27a6ad39f 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -80,10 +80,10 @@ TrainerHouseSign: jumptext TrainerHouseSignText ViridianCityPokecenterSign: - jumpstd pokecentersign + jumpstd PokecenterSignScript ViridianCityMartSign: - jumpstd martsign + jumpstd MartSignScript ViridianCityCoffeeGrampsQuestionText: text "Hey, kid! I just" diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 603b12e59..9f4a6f355 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -55,11 +55,11 @@ ViridianGymGuyScript: ViridianGymStatue: checkflag ENGINE_EARTHBADGE iftrue .Beaten - jumpstd gymstatue1 + jumpstd GymStatue1Script .Beaten: gettrainername STRING_BUFFER_4, BLUE, BLUE1 - jumpstd gymstatue2 + jumpstd GymStatue2Script LeaderBlueBeforeText: text "BLUE: Yo! Finally" diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 0b9349f57..66ddecfd9 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -10,7 +10,7 @@ ViridianPokecenter1F_MapScripts: db 0 ; callbacks ViridianPokecenter1FNurseScript: - jumpstd pokecenternurse + jumpstd PokecenterNurseScript ViridianPokecenter1FCooltrainerMScript: faceplayer diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index b456dd86e..953fb89c9 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -27,7 +27,7 @@ WhirlIslandB1FEscapeRope: itemball ESCAPE_ROPE WhirlIslandB1FBoulder: - jumpstd strengthboulder + jumpstd StrengthBoulderScript WhirlIslandB1FHiddenRareCandy: hiddenitem RARE_CANDY, EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY |