Resolve #723: treat std scripts like specials and predefs

2025-12-11 05:02:16 -08:00 · 2020-06-10 16:44:16 -04:00
parent 32e7e368f4
commit 518cee440e
180 changed files with 561 additions and 554 deletions
--- 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!"
--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -14,7 +14,7 @@ AzaleaPokecenter1F_MapScripts:
 	end

 AzaleaPokecenter1FNurseScript:
-	jumpstd pokecenternurse
+	jumpstd PokecenterNurseScript

 AzaleaPokecenter1FGentlemanScript:
 	jumptextfaceplayer AzaleaPokecenter1FGentlemanText
--- 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
--- 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>!"
--- 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."
--- 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"
--- 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
--- 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."
--- 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
--- 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-"
--- 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
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -120,7 +120,7 @@ BurnedTowerB1FTMEndure:
 	itemball TM_ENDURE

 BurnedTowerB1FBoulder:
-	jumpstd strengthboulder
+	jumpstd StrengthBoulderScript

 BurnedTowerRaikouMovement:
 	set_sliding
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -114,7 +114,7 @@ CeladonCafeTrashcan:
 	end

 .TrashEmpty:
-	jumpstd trashcan
+	jumpstd TrashCanScript

 ChefText_Eatathon:
 	text "Hi!"
--- 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
--- 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"
--- 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"
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -42,7 +42,7 @@ CeladonDeptStore3FSuperNerdScript:
 	jumptextfaceplayer CeladonDeptStore3FSuperNerdText

 CeladonDeptStore3FElevatorButton:
-	jumpstd elevatorbutton
+	jumpstd ElevatorButtonScript

 CeladonDeptStore3FDirectory:
 	jumptext CeladonDeptStore3FDirectoryText
--- 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"
--- 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"
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -100,7 +100,7 @@ CeladonDeptStore6FDirectory:

 ; unused
 CeladonDeptStore6FElevatorButton:
-	jumpstd elevatorbutton
+	jumpstd ElevatorButtonScript

 CeladonVendingText:
 	text "A vending machine!"
--- a/Show More
+++ b/Show More