diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/CeruleanCity_House1/scripts.inc | 4 | ||||
| -rw-r--r-- | data/maps/CeruleanCity_House4/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/CeruleanCity_House5/scripts.inc | 6 | ||||
| -rw-r--r-- | data/maps/PalletTown_PlayersHouse_2F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/PokemonLeague_LancesRoom/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc | 82 | ||||
| -rw-r--r-- | data/maps/SilphCo_Elevator/scripts.inc | 2 | ||||
| -rw-r--r-- | data/mystery_event_msg.s | 6 | ||||
| -rw-r--r-- | data/scripts/pc.inc | 8 | ||||
| -rw-r--r-- | data/scripts/pokedex_rating.inc | 2 | ||||
| -rw-r--r-- | data/scripts/trainer_battle.inc | 4 | ||||
| -rw-r--r-- | data/specials.inc | 36 |
12 files changed, 78 insertions, 78 deletions
diff --git a/data/maps/CeruleanCity_House1/scripts.inc b/data/maps/CeruleanCity_House1/scripts.inc index 9eb558eba..4f83fe24b 100644 --- a/data/maps/CeruleanCity_House1/scripts.inc +++ b/data/maps/CeruleanCity_House1/scripts.inc @@ -8,7 +8,7 @@ CeruleanCity_House1_EventScript_BadgeGuy:: @ 816A7F0 message CeruleanCity_House1_Text_DescribeWhichBadge waitmessage setvar VAR_0x8004, LISTMENU_BADGES - special Special_ListMenu + special ListMenu waitstate switch VAR_RESULT case 0, CeruleanCity_House1_EventScript_DescribeBoulderBadge @@ -26,7 +26,7 @@ CeruleanCity_House1_EventScript_BadgeGuy:: @ 816A7F0 CeruleanCity_House1_EventScript_DescribeAnotherBadge:: @ 816A87D message CeruleanCity_House1_Text_DescribeWhichBadge waitmessage - special Special_ReturnToListMenu + special ReturnToListMenu waitstate switch VAR_RESULT case 0, CeruleanCity_House1_EventScript_DescribeBoulderBadge diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index 3d96fd67c..b27579cee 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -5,7 +5,7 @@ CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock - specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState + specialvar VAR_0x8004, GetMENewsJisanItemAndState copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8004, 0 goto_if_eq CeruleanCity_House4_EventScript_NoNews diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 04615b895..dc5e2c2ff 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -38,7 +38,7 @@ CeruleanCity_House5_EventScript_ChooseExchangeItem:: @ 816AEC8 message CeruleanCity_House5_Text_ExchangeWithWhat waitmessage setvar VAR_0x8004, LISTMENU_BERRY_POWDER - special Special_ListMenu + special ListMenu waitstate switch VAR_RESULT case 0, CeruleanCity_House5_EventScript_EnergyPowder @@ -144,14 +144,14 @@ CeruleanCity_House5_EventScript_ExchangePowderForItem:: @ 816B055 compare VAR_RESULT, NO goto_if_eq CeruleanCity_House5_EventScript_ChooseExchangeItem copyvar VAR_0x8004, VAR_0x8009 - specialvar VAR_RESULT, Special_HasEnoughBerryPowder + specialvar VAR_RESULT, Script_HasEnoughBerryPowder compare VAR_RESULT, FALSE goto_if_eq CeruleanCity_House5_EventScript_NotEnoughBerryPowder giveitem VAR_0x8008 compare VAR_RESULT, FALSE goto_if_eq CeruleanCity_House5_EventScript_BagIsFull copyvar VAR_0x8004, VAR_0x8009 - special Special_TakeBerryPowder + special Script_TakeBerryPowder special PrintPlayerBerryPowderAmount msgbox CeruleanCity_House1_Text_TradeMoreBerryPowder, MSGBOX_YESNO compare VAR_RESULT, YES diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 644665017..975da4be1 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -33,7 +33,7 @@ PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4 goto_if_questlog EventScript_ReleaseEnd lockall setvar VAR_0x8004, 32 - special Special_SetSomeVariable + special HelpSystem_SetSomeVariable setvar VAR_0x8004, 1 special AnimatePcTurnOn playse SE_PC_ON diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 2328a777c..190e52d33 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -137,7 +137,7 @@ PokemonLeague_LancesRoom_EventScript_PostBattle:: @ 8162AA1 PokemonLeague_LancesRoom_EventScript_DefeatedLance:: @ 8162AAB setvar VAR_0x8004, 0 - special Special_TryGainNewFanFromCounter + special Script_TryGainNewFanFromCounter setflag FLAG_DEFEATED_LANCE call PokemonLeague_EventScript_OpenDoorLance msgbox PokemonLeague_LancesRoom_Text_PostBattle diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 731ec532d..dd791a58f 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -82,37 +82,37 @@ SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144 end SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 816F15B - special Special_TryLoseFansFromPlayTime + special Script_TryLoseFansFromPlayTime setvar VAR_0x8004, FANCLUB_MEMBER1 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER2 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER3 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER4 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER5 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER6 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER7 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER8 - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable end @@ -169,13 +169,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER1 - special Special_BufferFanClubTrainerName + special Script_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore @@ -183,7 +183,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281 end SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: @ 816F2C0 - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou @@ -209,13 +209,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER4 - special Special_BufferFanClubTrainerName + special Script_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina @@ -223,7 +223,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8 end SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 816F337 - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay @@ -249,13 +249,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER2 - special Special_BufferFanClubTrainerName + special Script_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero @@ -263,7 +263,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F end SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan:: @ 816F3AE - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts @@ -289,13 +289,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER3 - special Special_BufferFanClubTrainerName + special Script_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre @@ -303,7 +303,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6 end SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan:: @ 816F425 - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle @@ -329,11 +329,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER6 - special Special_BufferFanClubTrainerName - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + special Script_BufferFanClubTrainerName + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire @@ -341,7 +341,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D end SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 816F491 - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle @@ -362,11 +362,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER5 - special Special_BufferFanClubTrainerName - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + special Script_BufferFanClubTrainerName + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks @@ -374,7 +374,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF end SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan:: @ 816F4F3 - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool @@ -395,11 +395,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER7 - special Special_BufferFanClubTrainerName - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + special Script_BufferFanClubTrainerName + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity @@ -407,7 +407,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521 end SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan:: @ 816F555 - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing @@ -428,11 +428,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER8 - special Special_BufferFanClubTrainerName - specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer + special Script_BufferFanClubTrainerName + specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect @@ -440,7 +440,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583 end SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan:: @ 816F5B7 - specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub + specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 758cc1e52..9a9017004 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -11,7 +11,7 @@ SilphCo_Elevator_EventScript_FloorSelect:: @ 8161F6F waitmessage setvar VAR_0x8004, LISTMENU_SILPHCO_FLOORS specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos - special Special_ListMenu + special ListMenu waitstate switch VAR_RESULT case 0, SilphCo_Elevator_EventScript_To11F diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 2eab73984..419a7ec53 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -17,9 +17,9 @@ MysteryEventScript_StampCard:: @ 8488E28 setvaddress MysteryEventScript_StampCard setorcopyvar VAR_RESULT, 1 - specialvar VAR_0x8008, Special_BattleCardAction + specialvar VAR_0x8008, BattleCardAction setorcopyvar VAR_RESULT, 0 - specialvar VAR_0x8009, Special_BattleCardAction + specialvar VAR_0x8009, BattleCardAction subvar VAR_0x8008, VAR_0x8009 getnumberstring 0, VAR_0x8008 lock @@ -169,7 +169,7 @@ MysteryEventScript_BattleCard:: @ 84892B9 setvaddress MysteryEventScript_BattleCard vgoto_if_set FLAG_MYSTERY_EVENT_DONE, MysteryEventScript_BattleCardInfo setorcopyvar VAR_RESULT, 2 - specialvar VAR_0x8008, Special_BattleCardAction + specialvar VAR_0x8008, BattleCardAction compare VAR_0x8008, 3 vgoto_if_ne MysteryEventScript_BattleCardInfo lock diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index a517bced1..af9eca601 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -3,7 +3,7 @@ EventScript_PC:: @ 81A6955 lockall goto_if_set FLAG_SYS_PC_STORAGE_DISABLED, EventScript_PCDisabled setvar VAR_0x8004, 27 - special Special_SetSomeVariable + special HelpSystem_SetSomeVariable setvar VAR_0x8004, 0 special AnimatePcTurnOn playse SE_PC_ON @@ -20,7 +20,7 @@ EventScript_PCDisabled:: @ 81A698E EventScript_PCMainMenu:: @ 81A6998 message Text_AccessWhichPC waitmessage - special ScrSpecial_CreatePCMenu + special CreatePCMenu waitstate goto EventScript_ChoosePCMenu end @@ -51,7 +51,7 @@ EventScript_AccessPokemonStorage:: @ 81A6A05 special ShowPokemonStorageSystem waitstate setvar VAR_0x8004, 27 - special Special_SetSomeVariable + special HelpSystem_SetSomeVariable goto EventScript_PCMainMenu end @@ -76,7 +76,7 @@ EventScript_AccessHallOfFame:: @ 81A6A56 playse SE_PC_LOGIN setvar VAR_0x8004, 31 special HelpSystem_BackupSomeVariable - special Special_SetSomeVariable + special HelpSystem_SetSomeVariable special HallOfFamePCBeginFade waitstate special HelpSystem_RestoreSomeVariable diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index 903d06aa1..c8b126e60 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -37,7 +37,7 @@ PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC PokedexRating_EventScript_Rate:: @ 81A73E0 setvar VAR_0x8004, 31 special HelpSystem_BackupSomeVariable - special Special_SetSomeVariable + special HelpSystem_SetSomeVariable setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 3e4eb2c44..6a5dc3345 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -10,7 +10,7 @@ EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 faceplayer applymovement VAR_LAST_TALKED, Movement_RevealTrainer waitmovement 0 - specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought + specialvar VAR_RESULT, Script_HasTrainerBeenFought compare VAR_RESULT, FALSE goto_if_ne EventScript_NoTrainerBattle special PlayTrainerEncounterMusic @@ -24,7 +24,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 lock faceplayer call EventScript_RevealTrainer - specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought + specialvar VAR_RESULT, Script_HasTrainerBeenFought compare VAR_RESULT, FALSE goto_if_ne EventScript_NoDoubleTrainerBattle special HasEnoughMonsForDoubleBattle diff --git a/data/specials.inc b/data/specials.inc index 0e3c6d5ea..3f9addacb 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -62,7 +62,7 @@ gSpecials:: @ 815FD60 def_special GetTrainerBattleMode def_special ShowTrainerIntroSpeech def_special ShowTrainerCantBattleSpeech - def_special ScrSpecial_HasTrainerBeenFought + def_special Script_HasTrainerBeenFought def_special EndTrainerApproach def_special PlayTrainerEncounterMusic def_special ShouldTryRematchBattle @@ -171,14 +171,14 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial @ Berry Blender/Roulette specials def_special NullFieldSpecial def_special NullFieldSpecial - def_special Special_IsFanClubMemberFanOfPlayer - def_special Special_GetNumFansOfPlayerInTrainerFanClub - def_special Special_BufferFanClubTrainerName - def_special Special_TryLoseFansFromPlayTimeAfterLinkBattle - def_special Special_TryLoseFansFromPlayTime - def_special Special_SetPlayerGotFirstFans - def_special Special_UpdateTrainerFanClubGameClear - def_special Special_TryGainNewFanFromCounter + def_special Script_IsFanClubMemberFanOfPlayer + def_special Script_GetNumFansOfPlayerInTrainerFanClub + def_special Script_BufferFanClubTrainerName + def_special Script_TryLoseFansFromPlayTimeAfterLinkBattle + def_special Script_TryLoseFansFromPlayTime + def_special Script_SetPlayerGotFirstFans + def_special Script_UpdateTrainerFanClubGameClear + def_special Script_TryGainNewFanFromCounter def_special RockSmashWildEncounter def_special NullFieldSpecial @ Gabby and Ty specials def_special NullFieldSpecial @@ -239,7 +239,7 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial def_special NullFieldSpecial def_special GetLeadMonFriendship - def_special ScrSpecial_BattleTowerMapScript2 + def_special BattleTowerMapScript2 def_special ChooseNextBattleTowerTrainer def_special CheckPartyBattleTowerBanlist def_special PrintBattleTowerTrainerGreeting @@ -270,7 +270,7 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial - def_special ScrSpecial_CreatePCMenu + def_special CreatePCMenu def_special HallOfFamePCBeginFade def_special ShowDiploma def_special NullFieldSpecial @ Check lead mon Contest strength specials @@ -352,8 +352,8 @@ gSpecials:: @ 815FD60 def_special sub_810B82C def_special StartMarowakBattle def_special ForcePlayerOntoBike - def_special Special_ListMenu - def_special Special_ReturnToListMenu + def_special ListMenu + def_special ReturnToListMenu def_special sub_80CADC4 def_special SetVermilionTrashCans def_special sub_805D1A8 @@ -389,7 +389,7 @@ gSpecials:: @ 815FD60 def_special TakePokemonFromRoute5Daycare def_special DoSeagallopFerryScene def_special DoesPlayerPartyContainSpecies - def_special Special_SetSomeVariable + def_special HelpSystem_SetSomeVariable def_special HelpSystem_BackupSomeVariable def_special HelpSystem_RestoreSomeVariable def_special ValidateReceivedWonderCard @@ -398,10 +398,10 @@ gSpecials:: @ 815FD60 def_special BufferUnionRoomPlayerName def_special sub_811390C def_special GetMartClerkObjectId - def_special Special_BattleCardAction + def_special BattleCardAction def_special GetQuestLogState def_special sub_8112364 - def_special Special_GetMENewsJisanItemAndState + def_special GetMENewsJisanItemAndState def_special GetPCBoxToSendMon def_special OpenMuseumFossilPic def_special CloseMuseumFossilPic @@ -422,8 +422,8 @@ gSpecials:: @ 815FD60 def_special CheckHasAtLeastOneBerry def_special DisplayBerryPowderVendorMenu def_special RemoveBerryPowderVendorMenu - def_special Special_HasEnoughBerryPowder - def_special Special_TakeBerryPowder + def_special Script_HasEnoughBerryPowder + def_special Script_TakeBerryPowder def_special PrintPlayerBerryPowderAmount def_special DoPokemonLeagueLightingEffect def_special ShowBerryCrushRankings |