diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-24 11:17:05 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-24 11:17:05 -0500 |
| commit | d719d318e8b2de51e818485423ac878d20dd295a (patch) | |
| tree | d351a653914ee5dab13947b21a16552719c2a8c9 | |
| parent | 132fe4692581891802c38420bdd4744d58bf78d5 (diff) | |
Remove Special_ prefix from special routines (close #478)
163 files changed, 758 insertions, 758 deletions
diff --git a/charmap.asm b/charmap.asm index 283508416..86a5596a4 100644 --- a/charmap.asm +++ b/charmap.asm @@ -86,7 +86,7 @@ charmap "▲", $61 ; gfx/font/up_arrow.png charmap "☎", $62 ; gfx/font/phone_icon.2bpp - ; needed for Special_MagikarpHouseSign (see engine/events/magikarp.asm) + ; needed for MagikarpHouseSign (see engine/events/magikarp.asm) charmap "′", $6e ; gfx/font/feet_inches.png charmap "″", $6f ; gfx/font/feet_inches.png diff --git a/constants/script_constants.asm b/constants/script_constants.asm index cfab61c87..9d2fd733e 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -217,7 +217,7 @@ NUM_FRUIT_TREES EQU const_value +- 1 const SWARM_YANMA ; 1 -; Special_ActivateFishingSwarm writebyte arguments +; ActivateFishingSwarm writebyte arguments const_def const FISHSWARM_NONE ; 0 const FISHSWARM_QWILFISH ; 1 @@ -229,7 +229,7 @@ NUM_FRUIT_TREES EQU const_value +- 1 const GBCHECK_SGB ; 1 const GBCHECK_CGB ; 2 -; Special_CheckMagikarpLength return values +; CheckMagikarpLength return values const_def const MAGIKARPLENGTH_NOT_MAGIKARP ; 0 const MAGIKARPLENGTH_REFUSED ; 1 @@ -257,7 +257,7 @@ NUM_FRUIT_TREES EQU const_value +- 1 const HEALMACHINE_ELMS_LAB ; 1 const HEALMACHINE_HALL_OF_FAME ; 2 -; Special_UnownPuzzle writebyte arguments +; UnownPuzzle writebyte arguments ; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/unown_puzzle.asm) const_def const UNOWNPUZZLE_KABUTO ; 0 @@ -266,7 +266,7 @@ NUM_FRUIT_TREES EQU const_value +- 1 const UNOWNPUZZLE_HO_OH ; 3 NUM_UNOWN_PUZZLES EQU const_value -; Special_DisplayUnownWords writebyte arguments +; DisplayUnownWords writebyte arguments ; UnownWalls and MenuHeaders_UnownWalls indexes (see data/unown_walls.asm) const_def const UNOWNWORDS_ESCAPE ; 0 @@ -274,7 +274,7 @@ NUM_UNOWN_PUZZLES EQU const_value const UNOWNWORDS_WATER ; 2 const UNOWNWORDS_HO_OH ; 3 -; Special_MoveTutor writebyte arguments +; MoveTutor writebyte arguments const_value set 1 const MOVETUTOR_FLAMETHROWER ; 1 const MOVETUTOR_THUNDERBOLT ; 2 diff --git a/data/special_pointers.asm b/data/special_pointers.asm index e8d1e9a54..575d9fa33 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -7,179 +7,179 @@ add_special: MACRO ENDM SpecialsPointers:: ; c029 - add_special Special_WarpToSpawnPoint + add_special WarpToSpawnPoint ; Communications - add_special Special_SetBitsForLinkTradeRequest - add_special Special_WaitForLinkedFriend - add_special Special_CheckLinkTimeout - add_special Special_TryQuickSave - add_special Special_CheckBothSelectedSameRoom - add_special Special_FailedLinkToPast - add_special Special_CloseLink - add_special Special_WaitForOtherPlayerToExit - add_special Special_SetBitsForBattleRequest - add_special Special_SetBitsForTimeCapsuleRequest - add_special Special_CheckTimeCapsuleCompatibility - add_special Special_EnterTimeCapsule - add_special Special_TradeCenter - add_special Special_Colosseum - add_special Special_TimeCapsule - add_special Special_CableClubCheckWhichChris - add_special Special_CheckMysteryGift - add_special Special_GetMysteryGiftItem - add_special Special_UnlockMysteryGift + add_special SetBitsForLinkTradeRequest + add_special WaitForLinkedFriend + add_special CheckLinkTimeout + add_special TryQuickSave + add_special CheckBothSelectedSameRoom + add_special FailedLinkToPast + add_special CloseLink + add_special WaitForOtherPlayerToExit + add_special SetBitsForBattleRequest + add_special SetBitsForTimeCapsuleRequest + add_special CheckTimeCapsuleCompatibility + add_special EnterTimeCapsule + add_special TradeCenter + add_special Colosseum + add_special TimeCapsule + add_special CableClubCheckWhichChris + add_special CheckMysteryGift + add_special GetMysteryGiftItem + add_special UnlockMysteryGift ; Map Events - add_special Special_BugContestJudging - add_special Special_CheckPartyFullAfterContest - add_special Special_ContestDropOffMons - add_special Special_ContestReturnMons - add_special Special_GiveParkBalls - add_special Special_CheckMagikarpLength - add_special Special_MagikarpHouseSign + add_special BugContestJudging + add_special CheckPartyFullAfterContest + add_special ContestDropOffMons + add_special ContestReturnMons + add_special GiveParkBalls + add_special CheckMagikarpLength + add_special MagikarpHouseSign add_special HealParty ; this is both a special and a predef - add_special Special_PokemonCenterPC - add_special Special_PlayersHousePC - add_special Special_DayCareMan - add_special Special_DayCareLady - add_special Special_DayCareManOutside - add_special Special_MoveDeletion - add_special Special_BankOfMom - add_special Special_MagnetTrain - add_special Special_NameRival - add_special Special_SetDayOfWeek - add_special Special_OverworldTownMap - add_special Special_UnownPrinter - add_special Special_MapRadio - add_special Special_UnownPuzzle - add_special Special_SlotMachine - add_special Special_CardFlip - add_special Special_DummyNonfunctionalGameCornerGame - add_special Special_ClearBGPalettesBufferScreen - add_special Special_FadeOutPalettes - add_special Special_BattleTowerFade - add_special Special_FadeBlackQuickly - add_special Special_FadeInPalettes - add_special Special_FadeInQuickly + add_special PokemonCenterPC + add_special PlayersHousePC + add_special DayCareMan + add_special DayCareLady + add_special DayCareManOutside + add_special MoveDeletion + add_special BankOfMom + add_special MagnetTrain + add_special NameRival + add_special SetDayOfWeek + add_special OverworldTownMap + add_special UnownPrinter + add_special MapRadio + add_special UnownPuzzle + add_special SlotMachine + add_special CardFlip + add_special DummyNonfunctionalGameCornerGame + add_special ClearBGPalettesBufferScreen + add_special FadeOutPalettes + add_special BattleTowerFade + add_special FadeBlackQuickly + add_special FadeInPalettes + add_special FadeInQuickly add_special ReloadSpritesNoPalettes ; bank 0 add_special ClearBGPalettes ; bank 0 add_special UpdateTimePals ; bank 0 add_special ClearTileMap ; bank 0 add_special UpdateSprites ; bank 0 add_special ReplaceKrisSprite ; bank 0 - add_special Special_GameCornerPrizeMonCheckDex + add_special GameCornerPrizeMonCheckDex add_special UnusedSpecial_SeenMon add_special WaitSFX ; bank 0 add_special PlayMapMusic ; bank 0 add_special RestartMapMusic ; bank 0 - add_special Special_HealMachineAnim - add_special Special_SurfStartStep - add_special Special_FindPartyMonGreaterThanThatLevel - add_special Special_FindPartyMonAtLeastThatHappy - add_special Special_FindPartyMonThatSpecies - add_special Special_FindPartyMonThatSpeciesYourTrainerID + add_special HealMachineAnim + add_special SurfStartStep + add_special FindPartyMonGreaterThanThatLevel + add_special FindPartyMonAtLeastThatHappy + add_special FindPartyMonThatSpecies + add_special FindPartyMonThatSpeciesYourTrainerID add_special UnusedSpecial_CheckUnusedTwoDayTimer - add_special Special_DayCareMon1 - add_special Special_DayCareMon2 - add_special Special_SelectRandomBugContestContestants - add_special Special_ActivateFishingSwarm - add_special Special_ToggleMaptileDecorations - add_special Special_ToggleDecorationsVisibility - add_special Special_GiveShuckle - add_special Special_ReturnShuckle - add_special Special_BillsGrandfather - add_special Special_CheckPokerus - add_special Special_DisplayCoinCaseBalance - add_special Special_DisplayMoneyAndCoinBalance - add_special Special_PlaceMoneyTopRight - add_special Special_CheckForLuckyNumberWinners - add_special Special_CheckLuckyNumberShowFlag - add_special Special_ResetLuckyNumberShowFlag - add_special Special_PrintTodaysLuckyNumber - add_special Special_SelectApricornForKurt - add_special Special_NameRater - add_special Special_DisplayLinkRecord - add_special Special_GetFirstPokemonHappiness - add_special Special_CheckFirstMonIsEgg - add_special Special_RandomUnseenWildMon - add_special Special_RandomPhoneWildMon - add_special Special_RandomPhoneMon - add_special Special_LoadUsedSpritesGFX - add_special Special_PlaySlowCry - add_special Special_SnorlaxAwake - add_special Special_YoungerHaircutBrother - add_special Special_OlderHaircutBrother - add_special Special_DaisysGrooming - add_special Special_PlayCurMonCry - add_special Special_ProfOaksPCBoot - add_special Special_GameboyCheck - add_special Special_TrainerHouse - add_special Special_PhotoStudio - add_special Special_InitRoamMons - add_special Special_FadeOutMusic - add_special Special_Diploma - add_special Special_PrintDiploma + add_special DayCareMon1 + add_special DayCareMon2 + add_special SelectRandomBugContestContestants + add_special ActivateFishingSwarm + add_special ToggleMaptileDecorations + add_special ToggleDecorationsVisibility + add_special GiveShuckle + add_special ReturnShuckle + add_special BillsGrandfather + add_special CheckPokerus + add_special DisplayCoinCaseBalance + add_special DisplayMoneyAndCoinBalance + add_special PlaceMoneyTopRight + add_special CheckForLuckyNumberWinners + add_special CheckLuckyNumberShowFlag + add_special ResetLuckyNumberShowFlag + add_special PrintTodaysLuckyNumber + add_special SelectApricornForKurt + add_special NameRater + add_special DisplayLinkRecord + add_special GetFirstPokemonHappiness + add_special CheckFirstMonIsEgg + add_special RandomUnseenWildMon + add_special RandomPhoneWildMon + add_special RandomPhoneMon + add_special LoadUsedSpritesGFX + add_special PlaySlowCry + add_special SnorlaxAwake + add_special YoungerHaircutBrother + add_special OlderHaircutBrother + add_special DaisysGrooming + add_special PlayCurMonCry + add_special ProfOaksPCBoot + add_special GameboyCheck + add_special TrainerHouse + add_special PhotoStudio + add_special InitRoamMons + add_special FadeOutMusic + add_special Diploma + add_special PrintDiploma ; Crystal - add_special Special_Function11ac3e - add_special Special_Function11b444 - add_special Special_Function11b5e8 - add_special Special_Function11b7e5 - add_special Special_Function11b879 - add_special Special_Function11b920 - add_special Special_Function11b93b - add_special Special_BattleTowerRoomMenu - add_special Special_Function1700ba - add_special Special_Function170114 - add_special Special_BattleTowerBattle + add_special Function11ac3e + add_special Function11b444 + add_special Function11b5e8 + add_special Function11b7e5 + add_special Function11b879 + add_special Function11b920 + add_special Function11b93b + add_special BattleTowerRoomMenu + add_special Function1700ba + add_special Function170114 + add_special BattleTowerBattle add_special UnusedSpecial_Function1704e1 add_special DummySpecial_17021d - add_special Special_LoadOpponentTrainerAndPokemonWithOTSprite - add_special Special_Function11ba38 - add_special Special_CheckForBattleTowerRules - add_special Special_GiveOddEgg + add_special LoadOpponentTrainerAndPokemonWithOTSprite + add_special Function11ba38 + add_special CheckForBattleTowerRules + add_special GiveOddEgg add_special Reset ; bank 0 - add_special Special_Function1011f1 - add_special Special_Function101220 - add_special Special_Function101225 - add_special Special_Function101231 - add_special Special_MoveTutor - add_special Special_OmanyteChamber - add_special Special_Function11c1ab - add_special Special_BattleTowerAction - add_special Special_DisplayUnownWords - add_special Special_Menu_ChallengeExplanationCancel - add_special Special_Function17d2b6 - add_special Special_Function17d2ce - add_special Special_BattleTowerMobileError - add_special Special_AskMobileOrCable - add_special Special_HoOhChamber - add_special Special_Function102142 - add_special Special_CelebiShrineEvent - add_special Special_CheckCaughtCelebi - add_special Special_PokeSeer - add_special Special_BuenasPassword - add_special Special_BuenaPrize - add_special Special_Dratini - add_special Special_SampleKenjiBreakCountdown - add_special Special_BeastsCheck - add_special Special_MonCheck - add_special Special_SetPlayerPalette + add_special Function1011f1 + add_special Function101220 + add_special Function101225 + add_special Function101231 + add_special MoveTutor + add_special OmanyteChamber + add_special Function11c1ab + add_special BattleTowerAction + add_special DisplayUnownWords + add_special Menu_ChallengeExplanationCancel + add_special Function17d2b6 + add_special Function17d2ce + add_special BattleTowerMobileError + add_special AskMobileOrCable + add_special HoOhChamber + add_special Function102142 + add_special CelebiShrineEvent + add_special CheckCaughtCelebi + add_special PokeSeer + add_special BuenasPassword + add_special BuenaPrize + add_special Dratini + add_special SampleKenjiBreakCountdown + add_special BeastsCheck + add_special MonCheck + add_special SetPlayerPalette add_special DummySpecial_170bd2 - add_special Special_Mobile_SelectThreeMons - add_special Special_Function1037eb - add_special Special_Function10383c - add_special Special_StubbedTrainerRankings_Healings - add_special Special_RefreshSprites - add_special Special_Function1037c2 - add_special Special_Mobile_DummyReturnFalse - add_special Special_Function103780 - add_special Special_Function10387b - add_special Special_AskRememberPassword - add_special Special_LoadMapPalettes + add_special Mobile_SelectThreeMons + add_special Function1037eb + add_special Function10383c + add_special StubbedTrainerRankings_Healings + add_special RefreshSprites + add_special Function1037c2 + add_special Mobile_DummyReturnFalse + add_special Function103780 + add_special Function10387b + add_special AskRememberPassword + add_special LoadMapPalettes add_special UnusedSpecial_FindItemInPCOrBag - add_special Special_InitialSetDSTFlag - add_special Special_InitialClearDSTFlag + add_special InitialSetDSTFlag + add_special InitialClearDSTFlag add_special DummySpecial_c224 ; c224 diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 07c0deba3..31d642464 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -51,7 +51,7 @@ These are known bugs and glitches in the original Pokémon Crystal game: code th - [`LoadSpriteGFX` does not limit the capacity of `UsedSprites`](#loadspritegfx-does-not-limit-the-capacity-of-usedsprites) - [`ChooseWildEncounter` doesn't really validate the wild Pokémon species](#choosewildencounter-doesnt-really-validate-the-wild-pokémon-species) - [`TryObjectEvent` arbitrary code execution](#tryobjectevent-arbitrary-code-execution) -- [`Special_CheckBugContestContestantFlag` can read beyond its data table](#special_checkbugcontestcontestantflag-can-read-beyond-its-data-table) +- [`CheckBugContestContestantFlag` can read beyond its data table](#checkbugcontestcontestantflag-can-read-beyond-its-data-table) - [`ClearWRAM` only clears WRAM bank 1](#clearwram-only-clears-wram-bank-1) @@ -1417,12 +1417,12 @@ In [engine/events.asm](/engine/events.asm): **Fix:** Uncomment `pop bc`. -## `Special_CheckBugContestContestantFlag` can read beyond its data table +## `CheckBugContestContestantFlag` can read beyond its data table In [engine/events/bug_contest/contest_2.asm](/engine/events/bug_contest/contest_2.asm): ```asm -Special_CheckBugContestContestantFlag: ; 139ed +CheckBugContestContestantFlag: ; 139ed ; Checks the flag of the Bug Catching Contestant whose index is loaded in a. ; Bug: If a >= 10 when this is called, it will read beyond the table. diff --git a/engine/breeding.asm b/engine/breeding.asm index a03eda082..d66616061 100755 --- a/engine/breeding.asm +++ b/engine/breeding.asm @@ -887,7 +887,7 @@ Hatch_ShellFragmentLoop: ; 17418 (5:7418) jr nz, .loop ret -Special_DayCareMon1: ; 17421 +DayCareMon1: ; 17421 ld hl, DayCareMon1Text call PrintText ld a, [wBreedMon1Species] @@ -900,7 +900,7 @@ Special_DayCareMon1: ; 17421 call DayCareMonCompatibilityText jp PrintText -Special_DayCareMon2: ; 17440 +DayCareMon2: ; 17440 ld hl, DayCareMon2Text call PrintText ld a, [wBreedMon2Species] diff --git a/engine/caught_data.asm b/engine/caught_data.asm index f194ce1f0..9c7cfac79 100644 --- a/engine/caught_data.asm +++ b/engine/caught_data.asm @@ -1,4 +1,4 @@ -Special_CheckPartyFullAfterContest: ; 4d9e5 +CheckPartyFullAfterContest: ; 4d9e5 ld a, [wContestMon] and a jp z, .DidntCatchAnything diff --git a/engine/decorations.asm b/engine/decorations.asm index b3655f064..577d7399f 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -1102,7 +1102,7 @@ DecorationDesc_TownMapPoster: ; 0x26f91 opentext writetext .TownMapText waitbutton - special Special_OverworldTownMap + special OverworldTownMap closetext end ; 0x26f9b @@ -1194,7 +1194,7 @@ DecorationDesc_GiantOrnament: ; 26fdd db "@" ; 0x26feb -Special_ToggleMaptileDecorations: ; 26feb +ToggleMaptileDecorations: ; 26feb lb de, 0, 4 ld a, [Bed] call SetDecorationTile @@ -1248,7 +1248,7 @@ SetDecorationTile: ; 27037 ret ; 27043 -Special_ToggleDecorationsVisibility: ; 27043 +ToggleDecorationsVisibility: ; 27043 ld de, EVENT_PLAYERS_HOUSE_2F_CONSOLE ld hl, VariableSprites + SPRITE_CONSOLE - SPRITE_VARS ld a, [Console] diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 8cf85b7cf..9cf6917b2 100755 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -1,11 +1,11 @@ -Special_BattleTowerRoomMenu: ; 1700b0 +BattleTowerRoomMenu: ; 1700b0 ; special call InitBattleTowerChallengeRAM farcall _BattleTowerRoomMenu ret ; 1700ba -Special_Function1700ba: ; 1700ba +Function1700ba: ; 1700ba call InitBattleTowerChallengeRAM farcall Function11811a ret @@ -53,7 +53,7 @@ Function1700c4: ; 1700c4 ret ; 170114 -Special_Function170114: ; 170114 +Function170114: ; 170114 call InitBattleTowerChallengeRAM call .Function170121 farcall Function11805f @@ -182,7 +182,7 @@ Function170139: ; 170139 ret ; 170215 -Special_BattleTowerBattle: ; 170215 +BattleTowerBattle: ; 170215 xor a ld [wBattleTowerBattleEnded], a call _BattleTowerBattle @@ -243,7 +243,7 @@ RunBattleTowerTrainer: ; 17024d xor a ld [wLinkMode], a - farcall Special_StubbedTrainerRankings_Healings + farcall StubbedTrainerRankings_Healings farcall HealParty call ReadBTTrainerParty call Clears5_a89a @@ -900,7 +900,7 @@ UnusedSpecial_Function1704e1: ; 1704e1 db "れきだいりーダーいちらん@" ; 170687 -Special_BattleTowerAction: ; 170687 +BattleTowerAction: ; 170687 ld a, [ScriptVar] ld e, a ld d, 0 @@ -1603,7 +1603,7 @@ BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19 ld [ScriptVar], a ret -Special_LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44 +LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44 farcall Function_LoadOpponentTrainerAndPokemons ld a, [rSVBK] push af @@ -1654,7 +1654,7 @@ DummySpecial_170bd2: ; 170bd2 ret ; 170bd3 -Special_CheckForBattleTowerRules: ; 170bd3 +CheckForBattleTowerRules: ; 170bd3 farcall _CheckForBattleTowerRules jr c, .asm_170bde xor a ; FALSE diff --git a/engine/events/buena.asm b/engine/events/buena.asm index 26043b534..d1ed7bd51 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -1,4 +1,4 @@ -Special_BuenasPassword: ; 8af6b +BuenasPassword: ; 8af6b xor a ld [wWhichIndexSet], a ld hl, .MenuHeader @@ -67,7 +67,7 @@ endr ret ; 8afd4 -Special_BuenaPrize: ; 8afd4 +BuenaPrize: ; 8afd4 xor a ld [wMenuScrollPosition], a ld a, $1 diff --git a/engine/events/buena_menu.asm b/engine/events/buena_menu.asm index 5436b590e..4380234ec 100644 --- a/engine/events/buena_menu.asm +++ b/engine/events/buena_menu.asm @@ -1,4 +1,4 @@ -Special_AskRememberPassword: ; 4ae12 +AskRememberPassword: ; 4ae12 call .DoMenu ld a, $0 jr c, .okay diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index ba561abf2..c25da1658 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -1,4 +1,4 @@ -Special_GiveParkBalls: ; 135db +GiveParkBalls: ; 135db xor a ld [wContestMon], a ld a, 20 diff --git a/engine/events/bug_contest/contest_2.asm b/engine/events/bug_contest/contest_2.asm index 7ade44815..80f0bda97 100755 --- a/engine/events/bug_contest/contest_2.asm +++ b/engine/events/bug_contest/contest_2.asm @@ -1,4 +1,4 @@ -Special_SelectRandomBugContestContestants: ; 139a8 +SelectRandomBugContestContestants: ; 139a8 ; Select five random people to participate in the current contest. ; First we have to make sure that any old data is cleared away. @@ -56,7 +56,7 @@ Special_SelectRandomBugContestContestants: ; 139a8 ret ; 139ed -Special_CheckBugContestContestantFlag: ; 139ed +CheckBugContestContestantFlag: ; 139ed ; Checks the flag of the Bug Catching Contestant whose index is loaded in a. ; Bug: If a >= NUM_BUG_CONTESTANTS when this is called, it will read beyond the table. @@ -76,7 +76,7 @@ Special_CheckBugContestContestantFlag: ; 139ed INCLUDE "data/bug_contest_flags.asm" -Special_ContestDropOffMons: ; 13a12 +ContestDropOffMons: ; 13a12 ld hl, PartyMon1HP ld a, [hli] or [hl] @@ -101,7 +101,7 @@ Special_ContestDropOffMons: ; 13a12 ret ; 13a31 -Special_ContestReturnMons: ; 13a31 +ContestReturnMons: ; 13a31 ; Restore the species of the second mon. ld hl, PartySpecies + 1 ld a, [wBugContestSecondPartySpecies] diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index a8cb80efe..e9659707b 100755 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -244,7 +244,7 @@ ComputeAIContestantScores: ; 138b0 ld e, 0 .loop push de - call Special_CheckBugContestContestantFlag + call CheckBugContestContestantFlag pop de jr nz, .done ld a, e diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm index 81565c27e..4d60a7d99 100755 --- a/engine/events/celebi.asm +++ b/engine/events/celebi.asm @@ -1,6 +1,6 @@ SPECIALCELEBIEVENT_CELEBI EQU $84 -Special_CelebiShrineEvent: ; 4989a +CelebiShrineEvent: ; 4989a call DelayFrame ld a, [VramState] push af @@ -362,7 +362,7 @@ CelebiEvent_SetBattleType: ; 49bf3 ; 49bf9 -Special_CheckCaughtCelebi: ; 49bf9 +CheckCaughtCelebi: ; 49bf9 ld a, [wBattleResult] bit 6, a jr z, .false diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index 3f9dbf84e..a201f14d9 100755 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -21,7 +21,7 @@ const DAYCARETEXT_OH_FINE const DAYCARETEXT_COME_AGAIN -Special_DayCareMan: ; 166d6 +DayCareMan: ; 166d6 ld hl, wDayCareMan bit DAYCAREMAN_HAS_MON_F, [hl] jr nz, .AskWithdrawMon @@ -60,7 +60,7 @@ Special_DayCareMan: ; 166d6 ret ; 1672a -Special_DayCareLady: ; 1672a +DayCareLady: ; 1672a ld hl, wDayCareLady bit DAYCARELADY_HAS_MON_F, [hl] jr nz, .AskWithdrawMon @@ -427,7 +427,7 @@ PrintDayCareText: ; 1689b db "@" ; 0x16936 -Special_DayCareManOutside: ; 16936 +DayCareManOutside: ; 16936 ld hl, wDayCareMan bit DAYCAREMAN_HAS_EGG_F, [hl] jr nz, .AskGiveEgg diff --git a/engine/events/dratini.asm b/engine/events/dratini.asm index 83732bef2..620a5a707 100644 --- a/engine/events/dratini.asm +++ b/engine/events/dratini.asm @@ -1,4 +1,4 @@ -Special_Dratini: ; 0x8b170 +Dratini: ; 0x8b170 ; if ScriptVar is 0 or 1, change the moveset of the last Dratini in the party. ; 0: give it a special moveset with Extremespeed. ; 1: give it the normal moveset of a level 15 Dratini. diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index e6c0629de..6b840a25a 100755 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -7,7 +7,7 @@ PlayWhirlpoolSound: ; 8c7d4 ; 8c7e1 BlindingFlash: ; 8c7e1 - farcall Special_FadeOutPalettes + farcall FadeOutPalettes ld hl, wStatusFlags set STATUSFLAGS_FLASH_F, [hl] farcall ReplaceTimeOfDayPals @@ -15,7 +15,7 @@ BlindingFlash: ; 8c7e1 ld b, SCGB_MAPPALS call GetSGBLayout farcall LoadOW_BGPal7 - farcall Special_FadeInPalettes + farcall FadeInPalettes ret ; 8c80a diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 3de91fa5c..fa7fbd791 100755 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -42,7 +42,7 @@ RedCredits:: ; 86455 ld [MusicFadeID + 1], a ld a, 10 ld [MusicFade], a - farcall Special_FadeOutPalettes + farcall FadeOutPalettes xor a ld [VramState], a ld [hMapAnims], a @@ -65,7 +65,7 @@ HallOfFame_FadeOutMusic: ; 8648e ld [MusicFadeID + 1], a ld a, 10 ld [MusicFade], a - farcall Special_FadeOutPalettes + farcall FadeOutPalettes xor a ld [VramState], a ld [hMapAnims], a diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm index 8a5ade3c8..f5055f512 100755 --- a/engine/events/happiness_egg.asm +++ b/engine/events/happiness_egg.asm @@ -1,4 +1,4 @@ -Special_GetFirstPokemonHappiness: ; 718d +GetFirstPokemonHappiness: ; 718d ld hl, PartyMon1Happiness ld bc, PARTYMON_STRUCT_LENGTH ld de, PartySpecies @@ -17,7 +17,7 @@ Special_GetFirstPokemonHappiness: ; 718d call GetPokemonName jp CopyPokemonName_Buffer1_Buffer3 -Special_CheckFirstMonIsEgg: ; 71ac +CheckFirstMonIsEgg: ; 71ac ld a, [PartySpecies] ld [wd265], a cp EGG diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm index 067b2f554..5573c7abd 100755 --- a/engine/events/heal_machine_anim.asm +++ b/engine/events/heal_machine_anim.asm @@ -1,4 +1,4 @@ -; Special_HealMachineAnim.Jumptable indexes +; HealMachineAnim.Jumptable indexes const_def const HEALMACHINESTATE_LOADGFX const HEALMACHINESTATE_PCLOADBALLS @@ -7,7 +7,7 @@ const HEALMACHINESTATE_HOFPLAYSFX const HEALMACHINESTATE_FINISH -Special_HealMachineAnim: ; 12324 +HealMachineAnim: ; 12324 ; If you have no Pokemon, don't change the buffer. This can lead to some glitchy effects if you have no Pokemon. ld a, [PartyCount] and a diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index 6547a7f30..62b71f0f4 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -22,7 +22,7 @@ Kurt_PrintTextHowMany: ; 8800c db "@" ; 0x88018 -Special_SelectApricornForKurt: ; 88018 +SelectApricornForKurt: ; 88018 call LoadStandardMenuHeader ld c, $1 xor a diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index a172fc431..043c5c5ee 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -1,4 +1,4 @@ -Special_CheckForLuckyNumberWinners: ; 4d87a +CheckForLuckyNumberWinners: ; 4d87a xor a ld [ScriptVar], a ld [wFoundMatchingIDInParty], a @@ -216,7 +216,7 @@ Special_CheckForLuckyNumberWinners: ; 4d87a text_jump UnknownText_0x1c12ae db "@" -Special_PrintTodaysLuckyNumber: ; 4d9d3 +PrintTodaysLuckyNumber: ; 4d9d3 ld hl, StringBuffer3 ld de, wLuckyIDNumber lb bc, PRINTNUM_LEADINGZEROS | 2, 5 diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 6588295b8..bb86a98ab 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -1,4 +1,4 @@ -Special_CheckMagikarpLength: ; fbb32 +CheckMagikarpLength: ; fbb32 ; Returns 3 if you select a Magikarp that beats the previous record. ; Returns 2 if you select a Magikarp, but the current record is longer. ; Returns 1 if you press B in the Pokemon selection menu. @@ -331,7 +331,7 @@ CalcMagikarpLength: ; fbbfc -Special_MagikarpHouseSign: ; fbcd2 +MagikarpHouseSign: ; fbcd2 ld a, [wBestMagikarpLengthFeet] ld [wMagikarpLength], a ld a, [wBestMagikarpLengthInches] diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm index be3faac28..6ca05c525 100755 --- a/engine/events/magnet_train.asm +++ b/engine/events/magnet_train.asm @@ -1,4 +1,4 @@ -Special_MagnetTrain: ; 8cc04 +MagnetTrain: ; 8cc04 ld a, [ScriptVar] and a jr nz, .ToGoldenrod diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm index 73ed89143..97372a57a 100755 --- a/engine/events/misc_scripts.asm +++ b/engine/events/misc_scripts.asm @@ -2,7 +2,7 @@ Script_AbortBugContest: ; 0x122c1 checkflag ENGINE_BUG_CONTEST_TIMER iffalse .finish setflag ENGINE_DAILY_BUG_CONTEST - special Special_ContestReturnMons + special ContestReturnMons .finish end diff --git a/engine/events/mom.asm b/engine/events/mom.asm index d8719e58d..a94a7b273 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -1,4 +1,4 @@ -Special_BankOfMom: ; 16218 +BankOfMom: ; 16218 ld a, [hInMenu] push af ld a, $1 diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index d5e4c56bf..5a6f23dd1 100644 --- a/engine/events/move_deleter.asm +++ b/engine/events/move_deleter.asm @@ -1,4 +1,4 @@ -Special_MoveDeletion: +MoveDeletion: ld hl, .IntroText call PrintText call YesNoBox diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index 31cb20bbb..29095cca2 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -1,4 +1,4 @@ -Special_MoveTutor: ; 4925b +MoveTutor: ; 4925b call FadeToMenu call ClearBGPalettes call ClearScreen diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 686f8560d..576c6eebf 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -422,7 +422,7 @@ UsedSurfScript: ; c986 special ReplaceKrisSprite special PlayMapMusic ; step into the water - special Special_SurfStartStep ; (slow_step_x, step_end) + special SurfStartStep ; (slow_step_x, step_end) applymovement PLAYER, MovementBuffer ; PLAYER, MovementBuffer end @@ -623,7 +623,7 @@ FlyFunction: ; ca3b special UpdateTimePals callasm FlyFromAnim farscall Script_AbortBugContest - special Special_WarpToSpawnPoint + special WarpToSpawnPoint callasm DelayLoadingNewSprites writecode VAR_MOVEMENT, PLAYER_NORMAL newloadmap MAPSETUP_FLY @@ -871,7 +871,7 @@ dig_incave playsound SFX_WARP_TO applymovement PLAYER, .DigOut farscall Script_AbortBugContest - special Special_WarpToSpawnPoint + special WarpToSpawnPoint writecode VAR_MOVEMENT, PLAYER_NORMAL newloadmap MAPSETUP_DOOR playsound SFX_WARP_FROM @@ -958,7 +958,7 @@ TeleportFunction: ; cc61 playsound SFX_WARP_TO applymovement PLAYER, .TeleportFrom farscall Script_AbortBugContest - special Special_WarpToSpawnPoint + special WarpToSpawnPoint writecode VAR_MOVEMENT, PLAYER_NORMAL newloadmap MAPSETUP_TELEPORT playsound SFX_WARP_FROM diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index fb9c6d9f9..09d24cf8f 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -15,7 +15,7 @@ const SEERACTION_CANT_TELL_2 const SEERACTION_LEVEL_ONLY -Special_PokeSeer: ; 4f0bc +PokeSeer: ; 4f0bc ld a, SEER_INTRO call PrintSeerText call JoyWaitAorB diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index ce50e80ac..7df787cf5 100755 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -1,4 +1,4 @@ -Special_PokemonCenterPC: ; 1559a +PokemonCenterPC: ; 1559a call PC_CheckPartyForPokemon ret c call PC_PlayBootSound diff --git a/engine/events/print_photo.asm b/engine/events/print_photo.asm index 54aa1892d..06b01bbcf 100755 --- a/engine/events/print_photo.asm +++ b/engine/events/print_photo.asm @@ -1,4 +1,4 @@ -Special_PhotoStudio: ; 16dc7 +PhotoStudio: ; 16dc7 ld hl, .Text_AskWhichMon call PrintText farcall SelectMonFromParty diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm index ae84a43a5..69949940b 100755 --- a/engine/events/prof_oaks_pc.asm +++ b/engine/events/prof_oaks_pc.asm @@ -3,7 +3,7 @@ ProfOaksPC: ; 0x265d3 call MenuTextBox call YesNoBox jr c, .shutdown - call Special_ProfOaksPCBoot ; player chose "yes"? + call ProfOaksPCBoot ; player chose "yes"? .shutdown ld hl, OakPCText4 call PrintText @@ -11,7 +11,7 @@ ProfOaksPC: ; 0x265d3 call ExitMenu ret -Special_ProfOaksPCBoot ; 0x265ee +ProfOaksPCBoot ; 0x265ee ld hl, OakPCText2 call PrintText call Rate diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm index 65ed83438..cc46eac9f 100755 --- a/engine/events/sacred_ash.asm +++ b/engine/events/sacred_ash.asm @@ -52,12 +52,12 @@ SacredAshScript: ; 0x50821 special HealParty reloadmappart playsound SFX_WARP_TO - special Special_FadeOutPalettes - special Special_FadeInPalettes - special Special_FadeOutPalettes - special Special_FadeInPalettes - special Special_FadeOutPalettes - special Special_FadeInPalettes + special FadeOutPalettes + special FadeInPalettes + special FadeOutPalettes + special FadeInPalettes + special FadeOutPalettes + special FadeInPalettes waitsfx writetext UnknownText_0x50845 playsound SFX_CAUGHT_MON diff --git a/engine/events/special.asm b/engine/events/special.asm index 7f87195e1..ecb75c8ea 100755 --- a/engine/events/special.asm +++ b/engine/events/special.asm @@ -1,6 +1,6 @@ MANIA_OT_ID EQU 00518 -Special_GiveShuckle: ; 7305 +GiveShuckle: ; 7305 ; Adding to the party. xor a @@ -71,7 +71,7 @@ SpecialShuckleOT: SpecialShuckleNick: db "SHUCKIE@" -Special_ReturnShuckle: ; 737e +ReturnShuckle: ; 737e farcall SelectMonFromParty jr c, .refused @@ -141,7 +141,7 @@ Special_ReturnShuckle: ; 737e ld [ScriptVar], a ret -Special_BillsGrandfather: ; 73f7 +BillsGrandfather: ; 73f7 farcall SelectMonFromParty jr c, .cancel ld a, [CurPartySpecies] @@ -155,15 +155,15 @@ Special_BillsGrandfather: ; 73f7 ld [ScriptVar], a ret -Special_YoungerHaircutBrother: ; 7413 +YoungerHaircutBrother: ; 7413 ld hl, Data_YoungerHaircutBrother jr HaircutOrGrooming -Special_OlderHaircutBrother: ; 7418 +OlderHaircutBrother: ; 7418 ld hl, Data_OlderHaircutBrother jr HaircutOrGrooming -Special_DaisysGrooming: ; 741d +DaisysGrooming: ; 741d ld hl, Data_DaisysGrooming ; fallthrough diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 7da52fe2f..47090c1c3 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -108,13 +108,13 @@ PokecenterNurseScript: farwritetext NurseTakePokemonText pause 20 - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings spriteface LAST_TALKED, LEFT pause 10 special HealParty playmusic MUSIC_NONE writebyte HEALMACHINE_POKECENTER - special Special_HealMachineAnim + special HealMachineAnim pause 30 special RestartMapMusic spriteface LAST_TALKED, DOWN @@ -124,7 +124,7 @@ PokecenterNurseScript: iftrue .no checkflag ENGINE_CAUGHT_POKERUS iftrue .no - special Special_CheckPokerus + special CheckPokerus iftrue .pokerus .no @@ -184,7 +184,7 @@ TownMapScript: opentext farwritetext TownMapText waitbutton - special Special_OverworldTownMap + special OverworldTownMap closetext end @@ -204,7 +204,7 @@ HomepageScript: Radio1Script: opentext writebyte MAPRADIO_POKEMON_CHANNEL - special Special_MapRadio + special MapRadio closetext end @@ -212,7 +212,7 @@ Radio2Script: ; Lucky Channel opentext writebyte MAPRADIO_LUCKY_CHANNEL - special Special_MapRadio + special MapRadio closetext end @@ -221,7 +221,7 @@ TrashCanScript: ; 0xbc1a5 PCScript: opentext - special Special_PokemonCenterPC + special PokemonCenterPC closetext end @@ -320,7 +320,7 @@ BugContestResultsScript: opentext farwritetext ContestResults_ReadyToJudgeText waitbutton - special Special_BugContestJudging + special BugContestJudging vartomem MEM_BUFFER_0 if_equal 1, BugContestResults_FirstPlace if_equal 2, BugContestResults_SecondPlace @@ -346,9 +346,9 @@ BugContestResults_FinishUp iffalse BugContestResults_DidNotLeaveMons farwritetext ContestResults_ReturnPartyText waitbutton - special Special_ContestReturnMons + special ContestReturnMons BugContestResults_DidNotLeaveMons - special Special_CheckPartyFullAfterContest + special CheckPartyFullAfterContest if_equal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp if_equal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp ; BUGCONTEST_BOXED_MON @@ -622,7 +622,7 @@ InitializeEventsScript: return AskNumber1MScript: - special Special_RandomPhoneMon + special RandomPhoneMon checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -707,7 +707,7 @@ AskNumber1MScript: end AskNumber2MScript: - special Special_RandomPhoneMon + special RandomPhoneMon checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -1810,7 +1810,7 @@ CoinVendor_IntroScript: ; 0xbcde0 farwritetext CoinVendor_IntroText .loop ; 0xbcde4 - special Special_DisplayMoneyAndCoinBalance + special DisplayMoneyAndCoinBalance loadmenuheader .MenuHeader verticalmenu closewindow @@ -1887,7 +1887,7 @@ CoinVendor_IntroScript: ; 0xbcde0 HappinessCheckScript: faceplayer opentext - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness if_less_than 50, .Unhappy if_less_than 150, .KindaHappy farwritetext HappinessText3 diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm index 903b7bb2b..e09d18fe8 100644 --- a/engine/events/unown_walls.asm +++ b/engine/events/unown_walls.asm @@ -1,4 +1,4 @@ -Special_HoOhChamber: ; 0x8addb +HoOhChamber: ; 0x8addb ld hl, PartySpecies ld a, [hl] cp HO_OH ; is Ho-oh the first Pokémon in the party? @@ -11,7 +11,7 @@ Special_HoOhChamber: ; 0x8addb ret ; 0x8adef -Special_OmanyteChamber: ; 8adef +OmanyteChamber: ; 8adef call GetMapDataPointer ; pointless? ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER ld b, CHECK_FLAG @@ -103,7 +103,7 @@ SpecialKabutoChamber: ; 8ae4e ret ; 8ae68 -Special_DisplayUnownWords: ; 8ae68 +DisplayUnownWords: ; 8ae68 ld a, [ScriptVar] ld hl, MenuHeaders_UnownWalls and a diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index aa629682f..9175bbb73 100755 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -10,7 +10,7 @@ Script_OverworldWhiteout:: ; 0x124c8 Script_Whiteout: ; 0x124ce writetext .WhitedOutText waitbutton - special Special_FadeOutPalettes + special FadeOutPalettes pause 40 special HealParty checkflag ENGINE_BUG_CONTEST_TIMER @@ -18,7 +18,7 @@ Script_Whiteout: ; 0x124ce callasm HalveMoney callasm GetWhiteoutSpawn farscall Script_AbortBugContest - special Special_WarpToSpawnPoint + special WarpToSpawnPoint newloadmap MAPSETUP_WARP end_all diff --git a/engine/events_2.asm b/engine/events_2.asm index 93044a23b..c27b4737f 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -1,7 +1,7 @@ ; More overworld event handling. -Special_WarpToSpawnPoint:: ; 97c28 +WarpToSpawnPoint:: ; 97c28 ld hl, wStatusFlags2 res STATUSFLAGS2_SAFARI_GAME_F, [hl] res STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] diff --git a/engine/link.asm b/engine/link.asm index c95969116..c67572872 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -2031,7 +2031,7 @@ Unreferenced_Function28f09: ; 28f09 INCLUDE "engine/trade_animation.asm" -Special_CheckTimeCapsuleCompatibility: ; 29bfb +CheckTimeCapsuleCompatibility: ; 29bfb ; Checks to see if your Party is compatible with the generation 1 games. Returns the following in ScriptVar: ; 0: Party is okay ; 1: At least one Pokemon was introduced in GS @@ -2126,7 +2126,7 @@ Function29c67: ; 29c67 ret ; 29c7b -Special_EnterTimeCapsule: ; 29c7b +EnterTimeCapsule: ; 29c7b ld c, 10 call DelayFrames ld a, $4 @@ -2140,7 +2140,7 @@ Special_EnterTimeCapsule: ; 29c7b ret ; 29c92 -Special_WaitForOtherPlayerToExit: ; 29c92 +WaitForOtherPlayerToExit: ; 29c92 ld c, 3 call DelayFrames ld a, CONNECTION_NOT_ESTABLISHED @@ -2188,21 +2188,21 @@ Special_WaitForOtherPlayerToExit: ; 29c92 ret ; 29ce8 -Special_SetBitsForLinkTradeRequest: ; 29ce8 +SetBitsForLinkTradeRequest: ; 29ce8 ld a, LINK_TRADECENTER - 1 ld [wPlayerLinkAction], a ld [wd265], a ret ; 29cf1 -Special_SetBitsForBattleRequest: ; 29cf1 +SetBitsForBattleRequest: ; 29cf1 ld a, LINK_COLOSSEUM - 1 ld [wPlayerLinkAction], a ld [wd265], a ret ; 29cfa -Special_SetBitsForTimeCapsuleRequest: ; 29cfa +SetBitsForTimeCapsuleRequest: ; 29cfa ld a, $2 ld [rSB], a xor a @@ -2217,7 +2217,7 @@ Special_SetBitsForTimeCapsuleRequest: ; 29cfa ret ; 29d11 -Special_WaitForLinkedFriend: ; 29d11 +WaitForLinkedFriend: ; 29d11 ld a, [wPlayerLinkAction] and a jr z, .no_link_action @@ -2289,7 +2289,7 @@ Special_WaitForLinkedFriend: ; 29d11 ret ; 29d92 -Special_CheckLinkTimeout: ; 29d92 +CheckLinkTimeout: ; 29d92 ld a, $1 ld [wPlayerLinkAction], a ld hl, wLinkTimeoutFrames @@ -2427,7 +2427,7 @@ Link_CheckCommunicationError: ; 29e0c ret ; 29e66 -Special_TryQuickSave: ; 29e66 +TryQuickSave: ; 29e66 ld a, [wd265] push af farcall Link_SaveGame @@ -2443,7 +2443,7 @@ Special_TryQuickSave: ; 29e66 ret ; 29e82 -Special_CheckBothSelectedSameRoom: ; 29e82 +CheckBothSelectedSameRoom: ; 29e82 ld a, [wd265] call Link_EnsureSync push af @@ -2470,7 +2470,7 @@ Special_CheckBothSelectedSameRoom: ; 29e82 ret ; 29eaf -Special_TimeCapsule: ; 29eaf +TimeCapsule: ; 29eaf ld a, LINK_TIMECAPSULE ld [wLinkMode], a call DisableSpriteUpdates @@ -2481,7 +2481,7 @@ Special_TimeCapsule: ; 29eaf ret ; 29ec4 -Special_TradeCenter: ; 29ec4 +TradeCenter: ; 29ec4 ld a, LINK_TRADECENTER ld [wLinkMode], a call DisableSpriteUpdates @@ -2492,7 +2492,7 @@ Special_TradeCenter: ; 29ec4 ret ; 29ed9 -Special_Colosseum: ; 29ed9 +Colosseum: ; 29ed9 ld a, LINK_COLOSSEUM ld [wLinkMode], a call DisableSpriteUpdates @@ -2503,7 +2503,7 @@ Special_Colosseum: ; 29ed9 ret ; 29eee -Special_CloseLink: ; 29eee +CloseLink: ; 29eee xor a ld [wLinkMode], a ld c, 3 @@ -2511,7 +2511,7 @@ Special_CloseLink: ; 29eee jp Link_ResetSerialRegistersAfterLinkClosure ; 29efa -Special_FailedLinkToPast: ; 29efa +FailedLinkToPast: ; 29efa ld c, 40 call DelayFrames ld a, $e @@ -2560,7 +2560,7 @@ Link_EnsureSync: ; 29f17 ret ; 29f47 -Special_CableClubCheckWhichChris: ; 29f47 +CableClubCheckWhichChris: ; 29f47 ld a, [hSerialConnectionStatus] cp USING_EXTERNAL_CLOCK ld a, TRUE diff --git a/engine/map_setup.asm b/engine/map_setup.asm index d2140c569..bf103a629 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -79,7 +79,7 @@ MapSetupCommands: ; 15440 dba LoadGraphics ; 0e dba LoadTileset ; 0f dba LoadMapTimeOfDay ; 10 - dba Special_LoadMapPalettes ; 11 + dba LoadMapPalettes ; 11 dba LoadWildMonData ; 12 dba RefreshMapSprites ; 13 dba HandleNewMap ; 14 @@ -91,8 +91,8 @@ MapSetupCommands: ; 15440 dba LoadMapAttributes ; 1a dba LoadMapAttributes_SkipPeople ; 1b dba ClearBGPalettes ; 1c - dba Special_FadeOutPalettes ; 1d - dba Special_FadeInPalettes ; 1e + dba FadeOutPalettes ; 1d + dba FadeInPalettes ; 1e dba GetCoordOfUpperLeftCorner ; 1f dba RestoreFacingAfterWarp ; 20 dba SpawnInFacingDown ; 21 diff --git a/engine/mart.asm b/engine/mart.asm index 8385cf0ad..12f9b88df 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -443,7 +443,7 @@ GetMartDialogGroup: ; 15ca3 BuyMenuLoop: ; 15cef - farcall Special_PlaceMoneyTopRight + farcall PlaceMoneyTopRight call UpdateSprites ld hl, MenuHeader_Buy call CopyMenuHeader diff --git a/engine/menu_2.asm b/engine/menu_2.asm index 84cc9ca5f..5b1165275 100644 --- a/engine/menu_2.asm +++ b/engine/menu_2.asm @@ -27,7 +27,7 @@ PlaceMenuItemQuantity: ; 0x24ac3 .done ret -Special_PlaceMoneyTopRight: ; 24ae8 +PlaceMoneyTopRight: ; 24ae8 ld hl, MenuHeader_0x24b15 call CopyMenuHeader jr PlaceMoneyTextBox @@ -64,7 +64,7 @@ MenuHeader_0x24b1d: ; 0x24b1d dw NULL db 1 ; default option -Special_DisplayCoinCaseBalance: ; 24b25 +DisplayCoinCaseBalance: ; 24b25 ; Place a text box of size 1x7 at 11, 0. hlcoord 11, 0 ld b, 1 @@ -82,7 +82,7 @@ Special_DisplayCoinCaseBalance: ; 24b25 call PrintNum ret -Special_DisplayMoneyAndCoinBalance: ; 24b4e +DisplayMoneyAndCoinBalance: ; 24b4e hlcoord 5, 0 ld b, 3 ld c, 13 diff --git a/engine/mystery_gift.asm b/engine/mystery_gift.asm index 0fb73a56c..5edf3ed0e 100755 --- a/engine/mystery_gift.asm +++ b/engine/mystery_gift.asm @@ -1157,7 +1157,7 @@ MysteryGift_CopyReceivedDecosToPC: ; 105091 (41:5091) jr c, .loop jp CloseSRAM -Special_UnlockMysteryGift: ; 1050b9 +UnlockMysteryGift: ; 1050b9 call GetMysteryGiftBank ld hl, sMysteryGiftUnlocked ld a, [hl] diff --git a/engine/overworld.asm b/engine/overworld.asm index 2cac7df02..32ef356e5 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -23,7 +23,7 @@ Function14146: ; mobile push af res 7, [hl] set 6, [hl] - call Special_LoadUsedSpritesGFX + call LoadUsedSpritesGFX pop af ld [wSpriteFlags], a ret @@ -35,15 +35,15 @@ Function14157: ; mobile push af set 7, [hl] res 6, [hl] - call Special_LoadUsedSpritesGFX + call LoadUsedSpritesGFX pop af ld [wSpriteFlags], a ret ; 14168 -Special_RefreshSprites:: ; 14168 +RefreshSprites:: ; 14168 call .Refresh - call Special_LoadUsedSpritesGFX + call LoadUsedSpritesGFX ret ; 1416f @@ -164,7 +164,7 @@ AddOutdoorSprites: ; 141ee ; 14209 -Special_LoadUsedSpritesGFX: ; 14209 +LoadUsedSpritesGFX: ; 14209 ld a, MAPCALLBACK_SPRITES call RunMapCallback call GetUsedSprites diff --git a/engine/phone/generic_calls.asm b/engine/phone/generic_calls.asm index 937fc67c0..e1b53a950 100644 --- a/engine/phone/generic_calls.asm +++ b/engine/phone/generic_calls.asm @@ -1240,7 +1240,7 @@ PhoneScript_Generic_Female: end PhoneScript_MonFlavorText: - special Special_RandomPhoneMon + special RandomPhoneMon farscall PhoneScript_Random2 if_equal $0, .TooEnergetic farwritetext UnknownText_0x1b518b diff --git a/engine/phone/phone_callers.asm b/engine/phone/phone_callers.asm index cb333ae8d..c90448d33 100644 --- a/engine/phone/phone_callers.asm +++ b/engine/phone/phone_callers.asm @@ -1,5 +1,5 @@ Phone_GenericCall_Male: - special Special_RandomPhoneMon + special RandomPhoneMon farscall PhoneScript_Random2 if_equal 0, .Bragging farscall PhoneScript_Generic_Male @@ -9,7 +9,7 @@ Phone_GenericCall_Male: farjump Phone_BraggingCall_Male Phone_GenericCall_Female: - special Special_RandomPhoneMon + special RandomPhoneMon farscall PhoneScript_Random2 if_equal 0, .Bragging farscall PhoneScript_Generic_Female @@ -27,7 +27,7 @@ Phone_BraggingCall_Female: farjump Phone_FoundAMon_Female Phone_FoundAMon_Male: - special Special_RandomPhoneWildMon + special RandomPhoneWildMon farscall PhoneScript_Random2 if_equal 0, .GotAway farscall Phone_WhoDefeatedMon_Male @@ -37,7 +37,7 @@ Phone_FoundAMon_Male: farjump Phone_GotAwayCall_Male Phone_FoundAMon_Female: - special Special_RandomPhoneWildMon + special RandomPhoneWildMon farscall PhoneScript_Random2 if_equal 0, .GotAway farscall Phone_WhoDefeatedMon_Female @@ -851,7 +851,7 @@ Phone_CheckIfUnseenRare_Female: farjump PhoneScript_HangupText_Female PhoneScriptRareWildMon: - special Special_RandomUnseenWildMon + special RandomUnseenWildMon end PhoneScript_BugCatchingContest: diff --git a/engine/phone/phone_scripts.asm b/engine/phone/phone_scripts.asm index cc72cf189..3cbd60f51 100644 --- a/engine/phone/phone_scripts.asm +++ b/engine/phone/phone_scripts.asm @@ -392,7 +392,7 @@ HueyPhoneScript1: iftrue HueyWednesdayNight .NotWednesday: - special Special_RandomPhoneMon + special RandomPhoneMon farjump UnknownScript_0xa0908 .WantsBattle: @@ -629,7 +629,7 @@ JoeyPhoneScript1: iftrue JoeyMondayAfternoon .NotMonday: - special Special_RandomPhoneMon + special RandomPhoneMon farjump UnknownScript_0xa0930 .WantsBattle: @@ -830,7 +830,7 @@ Ralph_SetUpSwarm: pokenamemem QWILFISH, MEM_BUFFER_1 landmarktotext ROUTE_32, MEM_BUFFER_2 writebyte FISHSWARM_QWILFISH - special Special_ActivateFishingSwarm + special ActivateFishingSwarm farjump UnknownScript_0xa05d6 .Generic: @@ -851,7 +851,7 @@ LizPhoneScript1: iftrue LizThursdayAfternoon .NotThursday: - special Special_RandomPhoneMon + special RandomPhoneMon farjump UnknownScript_0xa0948 .WantsBattle: diff --git a/engine/player_object.asm b/engine/player_object.asm index f89a63fb1..a6e165221 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -577,7 +577,7 @@ TrainerWalkToPlayer: ; 831e call ComputePathToWalkToPlayer ret -Special_SurfStartStep: ; 8379 +SurfStartStep: ; 8379 call InitMovementBuffer call .GetMovementData call AppendToMovementBuffer diff --git a/engine/radio.asm b/engine/radio.asm index d2e36e572..d90a41dc2 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -972,9 +972,9 @@ BenFernText3B: LuckyNumberShow1: call StartRadioStation - callfar Special_CheckLuckyNumberShowFlag + callfar CheckLuckyNumberShowFlag jr nc, .dontreset - callfar Special_ResetLuckyNumberShowFlag + callfar ResetLuckyNumberShowFlag .dontreset ld hl, LC_Text1 ld a, LUCKY_NUMBER_SHOW_2 diff --git a/engine/routines/playslowcry.asm b/engine/routines/playslowcry.asm index 545629e51..6f28ea845 100644 --- a/engine/routines/playslowcry.asm +++ b/engine/routines/playslowcry.asm @@ -1,4 +1,4 @@ -Special_PlaySlowCry: ; fb841 +PlaySlowCry: ; fb841 ld a, [ScriptVar] call LoadCry jr c, .done diff --git a/engine/search.asm b/engine/search.asm index 495d4cc5e..0d4a8dc3c 100755 --- a/engine/search.asm +++ b/engine/search.asm @@ -1,4 +1,4 @@ -Special_BeastsCheck: ; 0x4a6e8 +BeastsCheck: ; 0x4a6e8 ; Check if the player owns all three legendary beasts. ; They must exist in either party or PC, and have the player's OT and ID. ; Return the result in ScriptVar. @@ -29,7 +29,7 @@ Special_BeastsCheck: ; 0x4a6e8 ret -Special_MonCheck: ; 0x4a711 +MonCheck: ; 0x4a711 ; Check if the player owns any monsters of the species in ScriptVar. ; Return the result in ScriptVar. diff --git a/engine/specials.asm b/engine/specials.asm index 4824c4b4c..2193106e7 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -20,14 +20,14 @@ DummySpecial_c224: ; c224 ret ; c225 -Special_SetPlayerPalette: ; c225 +SetPlayerPalette: ; c225 ld a, [ScriptVar] ld d, a farcall _SetPlayerPalette ret ; c230 -Special_GameCornerPrizeMonCheckDex: ; c230 +GameCornerPrizeMonCheckDex: ; c230 ld a, [ScriptVar] dec a call CheckCaughtMon @@ -50,28 +50,28 @@ UnusedSpecial_SeenMon: ; c252 ret ; c25a -Special_FindPartyMonGreaterThanThatLevel: ; c25a +FindPartyMonGreaterThanThatLevel: ; c25a ld a, [ScriptVar] ld b, a farcall _FindPartyMonGreaterThanThatLevel jr z, FoundNone jr FoundOne -Special_FindPartyMonAtLeastThatHappy: ; c268 +FindPartyMonAtLeastThatHappy: ; c268 ld a, [ScriptVar] ld b, a farcall _FindPartyMonAtLeastThatHappy jr z, FoundNone jr FoundOne -Special_FindPartyMonThatSpecies: ; c276 +FindPartyMonThatSpecies: ; c276 ld a, [ScriptVar] ld b, a farcall _FindPartyMonThatSpecies jr z, FoundNone jr FoundOne -Special_FindPartyMonThatSpeciesYourTrainerID: ; c284 +FindPartyMonThatSpeciesYourTrainerID: ; c284 ld a, [ScriptVar] ld b, a farcall _FindPartyMonThatSpeciesYourTrainerID @@ -89,7 +89,7 @@ FoundNone: ; c298 ret ; c29d -Special_NameRival: ; 0xc29d +NameRival: ; 0xc29d ld b, $2 ; rival ld de, RivalName farcall _NamingScreen @@ -103,33 +103,33 @@ Special_NameRival: ; 0xc29d DefaultRivalName: ; 0xc2b2 db "SILVER@" -Special_NameRater: ; c2b9 +NameRater: ; c2b9 farcall _NameRater ret ; c2c0 -Special_OverworldTownMap: ; c2c0 +OverworldTownMap: ; c2c0 call FadeToMenu farcall _TownMap call ExitAllMenus ret ; c2cd -Special_UnownPrinter: ; c2cd +UnownPrinter: ; c2cd call FadeToMenu farcall _UnownPrinter call ExitAllMenus ret ; c2da -Special_DisplayLinkRecord: ; c2da +DisplayLinkRecord: ; c2da call FadeToMenu farcall _DisplayLinkRecord call ExitAllMenus ret ; c2e7 -Special_PlayersHousePC: ; c2e7 +PlayersHousePC: ; c2e7 xor a ld [ScriptVar], a farcall _PlayersHousePC @@ -138,7 +138,7 @@ Special_PlayersHousePC: ; c2e7 ret ; c2f6 -Special_CheckMysteryGift: ; c2f6 +CheckMysteryGift: ; c2f6 ld a, BANK(sMysteryGiftItem) call GetSRAMBank ld a, [sMysteryGiftItem] @@ -152,7 +152,7 @@ Special_CheckMysteryGift: ; c2f6 ret ; c309 -Special_GetMysteryGiftItem: ; c309 +GetMysteryGiftItem: ; c309 ld a, BANK(sMysteryGiftItem) call GetSRAMBank ld a, [sMysteryGiftItem] @@ -187,21 +187,21 @@ Special_GetMysteryGiftItem: ; c309 db "@" ; 0xc34a -Special_BugContestJudging: ; c34a +BugContestJudging: ; c34a farcall _BugContestJudging ld a, b ld [ScriptVar], a ret ; c355 -Special_MapRadio: ; c355 +MapRadio: ; c355 ld a, [ScriptVar] ld e, a farcall PlayRadio ret ; c360 -Special_UnownPuzzle: ; c360 +UnownPuzzle: ; c360 call FadeToMenu farcall _UnownPuzzle ld a, [wSolvedUnownPuzzle] @@ -210,34 +210,34 @@ Special_UnownPuzzle: ; c360 ret ; c373 -Special_SlotMachine: ; c373 - call Special_CheckCoins +SlotMachine: ; c373 + call CheckCoinsAndCoinCase ret c ld a, BANK(_SlotMachine) ld hl, _SlotMachine - call Special_StartGameCornerGame + call StartGameCornerGame ret ; c380 -Special_CardFlip: ; c380 - call Special_CheckCoins +CardFlip: ; c380 + call CheckCoinsAndCoinCase ret c ld a, BANK(_CardFlip) ld hl, _CardFlip - call Special_StartGameCornerGame + call StartGameCornerGame ret ; c38d -Special_DummyNonfunctionalGameCornerGame: ; c38d - call Special_CheckCoins +DummyNonfunctionalGameCornerGame: ; c38d + call CheckCoinsAndCoinCase ret c ld a, BANK(_DummyGame) ld hl, _DummyGame - call Special_StartGameCornerGame + call StartGameCornerGame ret ; c39a -Special_StartGameCornerGame: ; c39a +StartGameCornerGame: ; c39a call FarQueueScript call FadeToMenu ld hl, wQueuedScriptBank @@ -252,7 +252,7 @@ Special_StartGameCornerGame: ; c39a ret ; c3ae -Special_CheckCoins: ; c3ae +CheckCoinsAndCoinCase: ; c3ae ld hl, Coins ld a, [hli] or [hl] @@ -290,7 +290,7 @@ Special_CheckCoins: ; c3ae db "@" ; 0xc3db -Special_ClearBGPalettesBufferScreen: ; c3db +ClearBGPalettesBufferScreen: ; c3db call ClearBGPalettes call BufferScreen ret @@ -314,7 +314,7 @@ UnusedSpecial_CheckUnusedTwoDayTimer: ; c3ef ret ; c3fc -Special_ActivateFishingSwarm: ; c3fc +ActivateFishingSwarm: ; c3fc ld a, [ScriptVar] ld [wFishingSwarmFlag], a ret @@ -341,13 +341,13 @@ StoreSwarmMapIndices:: ; c403 ; c419 -Special_CheckPokerus: ; c419 +CheckPokerus: ; c419 ; Check if a monster in your party has Pokerus farcall _CheckPokerus jp ScriptReturnCarry ; c422 -Special_ResetLuckyNumberShowFlag: ; c422 +ResetLuckyNumberShowFlag: ; c422 farcall RestartLuckyNumberCountdown ld hl, wLuckyNumberShowFlag res LUCKYNUMBERSHOW_GAME_OVER_F, [hl] @@ -355,12 +355,12 @@ Special_ResetLuckyNumberShowFlag: ; c422 ret ; c434 -Special_CheckLuckyNumberShowFlag: ; c434 +CheckLuckyNumberShowFlag: ; c434 farcall _CheckLuckyNumberShowFlag jp ScriptReturnCarry ; c43d -Special_SnorlaxAwake: ; 0xc43d +SnorlaxAwake: ; 0xc43d ; Check if the Poké Flute channel is playing, and if the player is standing ; next to Snorlax. @@ -411,13 +411,13 @@ Special_SnorlaxAwake: ; 0xc43d db -1 -Special_PlayCurMonCry: ; c472 +PlayCurMonCry: ; c472 ld a, [CurPartySpecies] jp PlayMonCry ; c478 -Special_GameboyCheck: ; c478 +GameboyCheck: ; c478 ld a, [hCGB] and a jr nz, .cgb @@ -439,7 +439,7 @@ Special_GameboyCheck: ; c478 ret -Special_FadeOutMusic: ; c48f +FadeOutMusic: ; c48f ld a, LOW(MUSIC_NONE) ld [MusicFadeID], a ld a, HIGH(MUSIC_NONE) @@ -449,21 +449,21 @@ Special_FadeOutMusic: ; c48f ret ; c49f -Special_Diploma: ; c49f +Diploma: ; c49f call FadeToMenu farcall _Diploma call ExitAllMenus ret ; c4ac -Special_PrintDiploma: ; c4ac +PrintDiploma: ; c4ac call FadeToMenu farcall _PrintDiploma call ExitAllMenus ret ; c4b9 -Special_TrainerHouse: ; 0xc4b9 +TrainerHouse: ; 0xc4b9 ld a, BANK(sMysteryGiftTrainerHouseFlag) call GetSRAMBank ld a, [sMysteryGiftTrainerHouseFlag] diff --git a/engine/time.asm b/engine/time.asm index 1bfe0e9aa..f3df62f71 100755 --- a/engine/time.asm +++ b/engine/time.asm @@ -125,12 +125,12 @@ endr dec [hl] jr nz, .DontRestartKenjiBreakCountdown .RestartKenjiBreakCountdown: - call Special_SampleKenjiBreakCountdown + call SampleKenjiBreakCountdown .DontRestartKenjiBreakCountdown: jr RestartDailyResetTimer ; 11485 -Special_SampleKenjiBreakCountdown: ; 11485 +SampleKenjiBreakCountdown: ; 11485 ; Generate a random number between 3 and 6 call Random and %11 diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 2e4d4eec0..2f99bf609 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -119,7 +119,7 @@ _UpdateTimePals:: ; 8c070 ret ; 8c079 -Special_FadeInPalettes:: ; 8c079 +FadeInPalettes:: ; 8c079 ld c, $12 call GetTimePalFade ld b, $4 @@ -127,7 +127,7 @@ Special_FadeInPalettes:: ; 8c079 ret ; 8c084 -Special_FadeOutPalettes:: ; 8c084 +FadeOutPalettes:: ; 8c084 call FillWhiteBGColor ld c, $9 call GetTimePalFade @@ -136,7 +136,7 @@ Special_FadeOutPalettes:: ; 8c084 ret ; 8c092 -Special_BattleTowerFade: ; 8c092 +BattleTowerFade: ; 8c092 call FillWhiteBGColor ld c, $9 call GetTimePalFade @@ -153,7 +153,7 @@ Special_BattleTowerFade: ; 8c092 ret ; 8c0ab -Special_FadeInQuickly: ; 8c0ab +FadeInQuickly: ; 8c0ab ld c, $0 call GetTimePalFade ld b, $4 @@ -161,7 +161,7 @@ Special_FadeInQuickly: ; 8c0ab ret ; 8c0b6 -Special_FadeBlackQuickly: ; 8c0b6 +FadeBlackQuickly: ; 8c0b6 ld c, $9 call GetTimePalFade ld b, $4 diff --git a/engine/timeset.asm b/engine/timeset.asm index 26b6aba60..62e59a5ae 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -407,7 +407,7 @@ TimeSetDownArrowGFX: ; 9090b INCBIN "gfx/new_game/down_arrow.1bpp" ; 90913 -Special_SetDayOfWeek: ; 90913 +SetDayOfWeek: ; 90913 ld a, [hInMenu] push af ld a, $1 @@ -573,7 +573,7 @@ Special_SetDayOfWeek: ; 90913 db "@" ; 0x90a54 -Special_InitialSetDSTFlag: ; 90a54 +InitialSetDSTFlag: ; 90a54 ld a, [wDST] set 7, a ld [wDST], a @@ -604,7 +604,7 @@ Special_InitialSetDSTFlag: ; 90a54 db "@" ; 0x90a88 -Special_InitialClearDSTFlag: ; 90a88 +InitialClearDSTFlag: ; 90a88 ld a, [wDST] res 7, a ld [wDST], a diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index a16a2885e..f2fb0ef31 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -305,12 +305,12 @@ LoadGraphics: ; 1047cf ld [hMapAnims], a xor a ld [hTileAnimFrame], a - farcall Special_RefreshSprites + farcall RefreshSprites call LoadFontsExtra farcall LoadOverworldFont ret -Special_LoadMapPalettes: ; 1047eb +LoadMapPalettes: ; 1047eb ld b, SCGB_MAPPALS jp GetSGBLayout ; 1047f0 diff --git a/engine/wildmons.asm b/engine/wildmons.asm index d2da42611..3b8d8619d 100755 --- a/engine/wildmons.asm +++ b/engine/wildmons.asm @@ -508,7 +508,7 @@ LookUpWildmonsForMapDE: ; 2a288 ; 2a2a0 -Special_InitRoamMons: ; 2a2a0 +InitRoamMons: ; 2a2a0 ; initialize wRoamMon structs ; species @@ -804,7 +804,7 @@ ValidateTempWildMonSpecies: ; 2a4a0 ; Finds a rare wild Pokemon in the route of the trainer calling, then checks if it's been Seen already. ; The trainer will then tell you about the Pokemon if you haven't seen it. -Special_RandomUnseenWildMon: ; 2a4ab +RandomUnseenWildMon: ; 2a4ab farcall GetCallerLocation ld d, b ld e, c @@ -877,7 +877,7 @@ Special_RandomUnseenWildMon: ; 2a4ab db "@" ; 0x2a51f -Special_RandomPhoneWildMon: ; 2a51f +RandomPhoneWildMon: ; 2a51f farcall GetCallerLocation ld d, b ld e, c @@ -917,7 +917,7 @@ Special_RandomPhoneWildMon: ; 2a51f jp CopyBytes ; 2a567 -Special_RandomPhoneMon: ; 2a567 +RandomPhoneMon: ; 2a567 ; Get a random monster owned by the trainer who's calling. farcall GetCallerLocation ld hl, TrainerGroups diff --git a/home/map.asm b/home/map.asm index 402b7f4ec..9c81d8034 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1984,7 +1984,7 @@ FadeToMenu:: ; 2b29 xor a ld [hBGMapMode], a call LoadStandardMenuHeader - farcall Special_FadeOutPalettes + farcall FadeOutPalettes call ClearSprites call DisableSpriteUpdates ret @@ -2010,7 +2010,7 @@ FinishExitMenu:: ; 2b5c call GetSGBLayout farcall LoadOW_BGPal7 call WaitBGMap2 - farcall Special_FadeInPalettes + farcall FadeInPalettes call EnableSpriteUpdates ret ; 2b74 @@ -2043,7 +2043,7 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74 ReloadTilesetAndPalettes:: ; 2bae call DisableLCD call ClearSprites - farcall Special_RefreshSprites + farcall RefreshSprites call LoadStandardFont call LoadFontsExtra ld a, [hROMBank] diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 83a29e7ad..b3a3fc61d 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -40,7 +40,7 @@ AzaleaTownRivalBattleScene1: moveobject AZALEATOWN_SILVER, 11, 11 spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear AZALEATOWN_SILVER applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1 @@ -50,7 +50,7 @@ AzaleaTownRivalBattleScene1: AzaleaTownRivalBattleScene2: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear AZALEATOWN_SILVER applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index b7113f347..79b75ee08 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -16,10 +16,10 @@ BattleTower1F_MapScripts: .Scene0: writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS - special Special_BattleTowerAction + special BattleTowerAction iffalse .SkipEverything writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState - special Special_BattleTowerAction + special BattleTowerAction if_equal $0, .SkipEverything if_equal $2, .priorityjump1 if_equal $3, .SkipEverything @@ -34,9 +34,9 @@ BattleTower1F_MapScripts: .priorityjump1 priorityjump BattleTower_LeftWithoutSaving writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction .SkipEverything: setscene 1 .Scene1: @@ -55,54 +55,54 @@ UnknownScript_0x9e3e0: ReceptionistScript_0x9e3e2: writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState - special Special_BattleTowerAction + special BattleTowerAction if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm opentext writetext Text_BattleTowerWelcomesYou buttonsound writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags] - special Special_BattleTowerAction + special BattleTowerAction if_not_equal $0, Script_Menu_ChallengeExplanationCancel jump Script_BattleTowerIntroductionYesNo Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc writetext Text_WantToGoIntoABattleRoom writebyte TRUE - special Special_Menu_ChallengeExplanationCancel + special Menu_ChallengeExplanationCancel if_equal 1, Script_ChooseChallenge if_equal 2, Script_BattleTowerExplanation jump Script_BattleTowerHopeToServeYouAgain Script_ChooseChallenge: ; 0x9e40f writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM - special Special_BattleTowerAction - special Special_CheckForBattleTowerRules + special BattleTowerAction + special CheckForBattleTowerRules if_not_equal FALSE, Script_WaitButton writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel setscene 0 - special Special_TryQuickSave + special TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel setscene 1 writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] - special Special_BattleTowerAction - special Special_BattleTowerRoomMenu + special BattleTowerAction + special BattleTowerRoomMenu if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, Script_MobileError writebyte BATTLETOWERACTION_11 - special Special_BattleTowerAction + special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom waitbutton closetext writebyte BATTLETOWERACTION_CHOOSEREWARD - special Special_BattleTowerAction + special BattleTowerAction jump Script_WalkToBattleTowerElevator Script_ResumeBattleTowerChallenge: closetext writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group - special Special_BattleTowerAction + special BattleTowerAction Script_WalkToBattleTowerElevator: musicfadeout MUSIC_NONE, 8 setmapscene BATTLE_TOWER_BATTLE_ROOM, 0 @@ -111,7 +111,7 @@ Script_WalkToBattleTowerElevator: follow BATTLETOWER1F_RECEPTIONIST, PLAYER applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator writebyte BATTLETOWERACTION_0A - special Special_BattleTowerAction + special BattleTowerAction warpsound disappear BATTLETOWER1F_RECEPTIONIST stopfollow @@ -121,15 +121,15 @@ Script_WalkToBattleTowerElevator: Script_GivePlayerHisPrize: ; 0x9e47a writebyte BATTLETOWERACTION_1C - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_GIVEREWARD - special Special_BattleTowerAction + special BattleTowerAction if_equal POTION, Script_YourPackIsStuffedFull itemtotext USE_SCRIPT_VAR, MEM_BUFFER_1 giveitem ITEM_FROM_MEM, 5 writetext Text_PlayerGotFive writebyte BATTLETOWERACTION_1D - special Special_BattleTowerAction + special BattleTowerAction closetext end @@ -147,7 +147,7 @@ Script_BattleTowerExplanation: ; 0x9e4a5 writetext Text_BattleTowerIntroduction_2 Script_BattleTowerSkipExplanation: writebyte BATTLETOWERACTION_SET_EXPLANATION_READ - special Special_BattleTowerAction + special BattleTowerAction jump Script_Menu_ChallengeExplanationCancel Script_BattleTowerHopeToServeYouAgain: @@ -157,7 +157,7 @@ Script_BattleTowerHopeToServeYouAgain: end UnreferencedScript_0x9e4b6: - special Special_BattleTowerMobileError + special BattleTowerMobileError closetext end @@ -170,11 +170,11 @@ UnreferencedScript_0x9e4be: writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel - special Special_TryQuickSave + special TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel writebyte BATTLETOWERACTION_SET_EXPLANATION_READ - special Special_BattleTowerAction - special Special_Function1700ba + special BattleTowerAction + special Function1700ba if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, Script_MobileError writetext Text_ReceivedAListOfLeadersOnTheHonorRoll @@ -187,15 +187,15 @@ UnreferencedScript_0x9e4be: UnreferencedScript_0x9e4ea: writebyte BATTLETOWERACTION_LEVEL_CHECK - special Special_BattleTowerAction + special BattleTowerAction if_not_equal $0, Script_APkmnLevelExceeds writebyte BATTLETOWERACTION_UBERS_CHECK - special Special_BattleTowerAction + special BattleTowerAction if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 - special Special_CheckForBattleTowerRules + special CheckForBattleTowerRules if_not_equal FALSE, Script_WaitButton writebyte BATTLETOWERACTION_05 - special Special_BattleTowerAction + special BattleTowerAction if_equal $0, .zero writetext Text_CantBeRegistered_PreviousRecordDeleted jump continue @@ -209,13 +209,13 @@ continue: yesorno iffalse Script_Menu_ChallengeExplanationCancel setscene 0 - special Special_TryQuickSave + special TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel setscene 1 writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_12 - special Special_BattleTowerAction + special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom waitbutton jump Script_ResumeBattleTowerChallenge @@ -236,7 +236,7 @@ Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549 jump Script_Menu_ChallengeExplanationCancel Script_MobileError: - special Special_BattleTowerMobileError + special BattleTowerMobileError closetext end diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index dd8e08e0f..849eac967 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -23,7 +23,7 @@ Script_BattleRoom: ; 0x9f421 ; beat all 7 opponents in a row Script_BattleRoomLoop: ; 0x9f425 writebyte BATTLETOWERBATTLEROOM_YOUNGSTER - special Special_LoadOpponentTrainerAndPokemonWithOTSprite + special LoadOpponentTrainerAndPokemonWithOTSprite appear BATTLETOWERBATTLEROOM_YOUNGSTER warpsound waitsfx @@ -32,8 +32,8 @@ Script_BattleRoomLoop: ; 0x9f425 battletowertext BATTLETOWERTEXT_INTRO buttonsound closetext - special Special_BattleTowerBattle ; calls predef startbattle - special Special_FadeOutPalettes + special BattleTowerBattle ; calls predef startbattle + special FadeOutPalettes reloadmap if_not_equal $0, Script_FailedBattleTowerChallenge copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 @@ -48,10 +48,10 @@ Script_BattleRoomLoop: ; 0x9f425 waitbutton closetext playmusic MUSIC_HEAL - special Special_FadeOutPalettes - special Special_LoadMapPalettes + special FadeOutPalettes + special LoadMapPalettes pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext Text_NextUpOpponentNo @@ -68,35 +68,35 @@ Script_DontBattleNextOpponent: ; 0x9f483 yesorno iffalse Script_DontSaveAndEndTheSession writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave - special Special_BattleTowerAction + special BattleTowerAction playsound SFX_SAVE waitsfx - special Special_FadeOutPalettes + special FadeOutPalettes special Reset Script_DontSaveAndEndTheSession: ; 0x9f4a3 writetext Text_CancelYourBattleRoomChallenge yesorno iffalse Script_ContinueAndBattleNextOpponent writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction closetext - special Special_FadeOutPalettes + special FadeOutPalettes warpfacing UP, BATTLE_TOWER_1F, 7, 7 opentext jump Script_BattleTowerHopeToServeYouAgain Script_FailedBattleTowerChallenge: pause 60 - special Special_BattleTowerFade + special BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, 7, 7 writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction opentext writetext Text_ThanksForVisiting waitbutton @@ -105,7 +105,7 @@ Script_FailedBattleTowerChallenge: Script_BeatenAllTrainers: ; 0x9f4d9 pause 60 - special Special_BattleTowerFade + special BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, 7, 7 Script_BeatenAllTrainers2: opentext @@ -114,7 +114,7 @@ Script_BeatenAllTrainers2: UnreferencedScript_0x9f4eb: writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction opentext writetext Text_TooMuchTimeElapsedNoRegister waitbutton @@ -123,9 +123,9 @@ UnreferencedScript_0x9f4eb: UnreferencedScript_0x9f4f7: writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction opentext writetext Text_ThanksForVisiting writetext Text_WeHopeToServeYouAgain diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index f9f32dfae..a10ad1552 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -22,7 +22,7 @@ BattleTowerElevator_MapScripts: applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn writebyte BATTLETOWERACTION_0A - special Special_BattleTowerAction + special BattleTowerAction playsound SFX_ELEVATOR earthquake 60 waitsfx diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 9c64ff04b..a13156484 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -37,7 +37,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal LICKITUNG, .WrongPokemon scall .CorrectPokemon @@ -51,7 +51,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal ODDISH, .WrongPokemon scall .CorrectPokemon @@ -65,7 +65,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal STARYU, .WrongPokemon scall .CorrectPokemon @@ -81,7 +81,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal GROWLITHE, .WrongPokemon scall .CorrectPokemon @@ -95,7 +95,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal VULPIX, .WrongPokemon scall .CorrectPokemon @@ -109,7 +109,7 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo if_not_equal PICHU, .WrongPokemon scall .CorrectPokemon diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 33510e154..3c4889c0c 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -26,21 +26,21 @@ DaisyScript: iffalse .Refused writetext DaisyWhichMonText waitbutton - special Special_DaisysGrooming + special DaisysGrooming if_equal $0, .Refused if_equal $1, .CantGroomEgg setflag ENGINE_DAISYS_GROOMING writetext DaisyAlrightText waitbutton closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext GroomedMonLooksContentText - special Special_PlayCurMonCry + special PlayCurMonCry buttonsound writetext DaisyAllDoneText waitbutton diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 71b3c1caa..25f517e00 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -51,7 +51,7 @@ BurnedTower1F_MapScripts: BurnedTowerRivalBattleScript: showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 spriteface BURNEDTOWER1F_SILVER, RIGHT pause 15 @@ -100,7 +100,7 @@ BurnedTowerRivalBattleScript: closetext setscene 2 setevent EVENT_RIVAL_BURNED_TOWER - special Special_FadeOutMusic + special FadeOutMusic pause 15 earthquake 50 showemote EMOTE_SHOCK, PLAYER, 15 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 3ad1d60f4..484c6f1cd 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -83,7 +83,7 @@ ReleaseTheBeasts: special RestartMapMusic setscene 1 setevent EVENT_RELEASED_THE_BEASTS - special Special_InitRoamMons + special InitRoamMons setmapscene ECRUTEAK_GYM, 1 setmapscene CIANWOOD_CITY, 1 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 188f977bb..87d380a6a 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -24,7 +24,7 @@ CeladonDeptStore6FVendingMachine: opentext writetext CeladonVendingText .Start: - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight loadmenuheader .MenuHeader verticalmenu closewindow diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 5d3382f53..090ce4571 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -115,20 +115,20 @@ CeladonGameCornerLuckySlotMachineScript: if_equal 0, CeladonGameCornerSlotMachineScript refreshscreen writebyte FALSE - special Special_SlotMachine + special SlotMachine closetext end CeladonGameCornerSlotMachineScript: refreshscreen writebyte TRUE - special Special_SlotMachine + special SlotMachine closetext end CeladonGameCornerCardFlipScript: refreshscreen - special Special_CardFlip + special CardFlip closetext end @@ -139,7 +139,7 @@ MapCeladonGameCornerSignpost9Script: opentext writetext UnknownText_0x72567 waitbutton - special Special_CardFlip + special CardFlip closetext end diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index b8d3ce032..a4f2d85ee 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -24,7 +24,7 @@ CeladonGameCornerPrizeRoomTMVendor: iffalse CeladonPrizeRoom_NoCoinCase writetext CeladonPrizeRoom_AskWhichPrizeText CeladonPrizeRoom_tmcounterloop: - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance loadmenuheader CeladonPrizeRoom_TMMenuHeader verticalmenu closewindow @@ -125,7 +125,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: iffalse CeladonPrizeRoom_NoCoinCase .loop writetext CeladonPrizeRoom_AskWhichPrizeText - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance loadmenuheader .MenuHeader verticalmenu closewindow @@ -147,7 +147,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: writetext CeladonPrizeRoom_HereYouGoText waitbutton writebyte PIKACHU - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke PIKACHU, 25 takecoins 2222 jump .loop @@ -165,7 +165,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: writetext CeladonPrizeRoom_HereYouGoText waitbutton writebyte PORYGON - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke PORYGON, 15 takecoins 5555 jump .loop @@ -183,7 +183,7 @@ CeladonGameCornerPrizeRoomPokemonVendor: writetext CeladonPrizeRoom_HereYouGoText waitbutton writebyte LARVITAR - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke LARVITAR, 40 takecoins 8888 jump .loop diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index bb6bb2f3f..418948dc8 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -28,7 +28,7 @@ UnknownScript_0x7167e: waitsfx writetext UnknownText_0x71760 buttonsound - special Special_Diploma + special Diploma writetext UnknownText_0x71763 waitbutton closetext @@ -49,7 +49,7 @@ UnknownScript_0x716a4: writetext UnknownText_0x717d8 yesorno iffalse UnknownScript_0x716b0 - special Special_PrintDiploma + special PrintDiploma closetext end diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index cfe31f624..06bf79f64 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -30,9 +30,9 @@ CeladonEusine: writetext CeladonEusineText1 buttonsound writebyte SUICUNE - special Special_MonCheck + special MonCheck iffalse .NoSuicune - special Special_BeastsCheck + special BeastsCheck iftrue .HoOh writetext NoBeastsText waitbutton diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 2efd5f743..914db5053 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -14,7 +14,7 @@ NurseScript_0x18820f: jumpstd pokecenternurse SuperNerdScript_0x188212: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x188221 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index ac3db17b6..eaa21864b 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -105,7 +105,7 @@ CherrygroveSilverSceneSouth: CherrygroveSilverSceneNorth: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear CHERRYGROVECITY_SILVER applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 82be11a81..82e4e459d 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -76,7 +76,7 @@ CianwoodCitySuicuneAndEusine: applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00ec disappear CIANWOODCITY_EUSINE pause 20 - special Special_FadeOutMusic + special FadeOutMusic playmapmusic pause 10 .Done: diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index bbf2eb3d9..52645b5d8 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -16,7 +16,7 @@ FishingGuruScript_0x9e0e0: iffalse UnknownScript_0x9e0f3 writetext UnknownText_0x9e142 waitbutton - special Special_PhotoStudio + special PhotoStudio waitbutton closetext end diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 024729400..5c2450fc5 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -25,7 +25,7 @@ Colosseum_MapScripts: end .SetWhichChris: - special Special_CableClubCheckWhichChris + special CableClubCheckWhichChris iffalse .Chris2 disappear COLOSSEUM_CHRIS2 appear COLOSSEUM_CHRIS1 @@ -46,7 +46,7 @@ Colosseum_MapScripts: end MapColosseumSignpost1Script: - special Special_Colosseum + special Colosseum newloadmap MAPSETUP_LINKRETURN end diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 74f6af110..0fda95f11 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -46,7 +46,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Default_Merge_1: - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX checkevent EVENT_RETURNED_MACHINE_PART iftrue .TalkAboutLostItem opentext @@ -70,7 +70,7 @@ Copycat: .Default_Merge_3a: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext CopycatText_QuickMimicking waitbutton @@ -99,7 +99,7 @@ Copycat: .Default_Merge_3b: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext CopycatText_Worried waitbutton @@ -142,7 +142,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .GotPass_Merge_1: - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext checkflag ENGINE_PLAYER_IS_FEMALE iftrue .GotPass_Female_2 @@ -164,7 +164,7 @@ Copycat: .GotPass_Merge_3: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext CopycatText_ItsAScream waitbutton diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 93461c3a8..c3499990b 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -32,7 +32,7 @@ DayCareManScript_Inside: closetext checkcode VAR_PARTYCOUNT if_equal PARTY_LENGTH, .PartyFull - special Special_GiveOddEgg + special GiveOddEgg opentext writetext DayCareText_GotOddEgg playsound SFX_KEY_ITEM @@ -51,7 +51,7 @@ DayCareManScript_Inside: end .AlreadyHaveOddEgg: - special Special_DayCareMan + special DayCareMan waitbutton closetext end @@ -61,7 +61,7 @@ DayCareLadyScript: opentext checkflag ENGINE_DAY_CARE_MAN_HAS_EGG iftrue .HusbandWasLookingForYou - special Special_DayCareLady + special DayCareLady waitbutton closetext end diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 1a524cb3a..90758584a 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -134,7 +134,7 @@ DragonShrine_MapScripts: writetext DragonShrineClairYouPassedText waitbutton closetext - special Special_FadeOutMusic + special FadeOutMusic applymovement DRAGONSHRINE_CLAIR, DragonShrineClairBigStepLeftMovement opentext writetext DragonShrineClairThatCantBeText @@ -217,7 +217,7 @@ DragonShrineElder1Script: waitsfx givepoke DRATINI, 15 checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG - special Special_Dratini + special Dratini setevent EVENT_GOT_DRATINI setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7 writetext DragonShrineSymbolicDragonText diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 9572a706f..c0c871c99 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -76,7 +76,7 @@ DragonsDenB1F_ClairScene: closetext .FinishClair: applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksAway - special Special_FadeOutMusic + special FadeOutMusic pause 30 special RestartMapMusic disappear DRAGONSDENB1F_CLAIR diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 30a7f5f35..8304cc907 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -91,7 +91,7 @@ EcruteakGymClosed: follow PLAYER, ECRUTEAKGYM_GRAMPS applymovement PLAYER, MovementData_0x99e5f stopfollow - special Special_FadeOutPalettes + special FadeOutPalettes playsound SFX_ENTER_DOOR waitsfx warp ECRUTEAK_CITY, 6, 27 diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index 409181ddc..8fd1436dd 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -61,7 +61,7 @@ EcruteakPokecenter1FNurseScript: jumpstd pokecenternurse EcruteakPokecenter1FPokefanMScript: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer EcruteakPokecenter1FPokefanMText diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 7002bd707..a0ab0c442 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -108,10 +108,10 @@ ElmCheckEverstone: checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE iffalse ElmCheckTogepiEgg writebyte TOGEPI - special Special_FindPartyMonThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writebyte TOGETIC - special Special_FindPartyMonThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writetext UnknownText_0x79a40 waitbutton @@ -120,10 +120,10 @@ ElmCheckEverstone: ElmEggHatchedScript: writebyte TOGEPI - special Special_FindPartyMonThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writebyte TOGETIC - special Special_FindPartyMonThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript jump ElmCheckGotEggAgain @@ -308,11 +308,11 @@ ElmsLabHealingMachine: end ElmsLabHealingMachine_HealParty: - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty playmusic MUSIC_NONE writebyte HEALMACHINE_ELMS_LAB - special Special_HealMachineAnim + special HealMachineAnim pause 30 special RestartMapMusic closetext @@ -556,7 +556,7 @@ CopScript: opentext writetext ElmsLabOfficerText1 buttonsound - special Special_NameRival + special NameRival writetext ElmsLabOfficerText2 waitbutton closetext diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 6dfb2350d..9da566ee7 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -68,7 +68,7 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY setmapscene VERMILION_PORT, 1 @@ -81,7 +81,7 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY setmapscene OLIVINE_PORT, 1 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index c6997603c..d53c76d5c 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -48,7 +48,7 @@ SSAquaGranddaughterBefore: writetext SSAquaGranddaughterHasToFindGrandpaText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 applymovement PLAYER, MovementData_0x76004 @@ -56,7 +56,7 @@ SSAquaGranddaughterBefore: appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 spriteface PLAYER, UP spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP - special Special_FadeInQuickly + special FadeInQuickly spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15 applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index c979ec074..76496baac 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -49,7 +49,7 @@ TrainerGuitaristClyde: .Script: end_if_just_battled - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile opentext writetext UnknownText_0x75d65 @@ -69,14 +69,14 @@ FastShipBed: writetext FastShipBedText1 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty playmusic MUSIC_HEAL pause 60 special RestartMapMusic - special Special_FadeInQuickly + special FadeInQuickly opentext writetext FastShipBedText2 waitbutton diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index a691d1d50..90ffab8c8 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -35,7 +35,7 @@ FuchsiaGymJanineScript: variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext Text_ReceivedSoulBadge playsound SFX_GET_BADGE @@ -65,7 +65,7 @@ LassAliceScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_1, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .AliceUnmasked: faceplayer opentext @@ -99,7 +99,7 @@ LassLindaScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_2, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .LindaUnmasked: faceplayer opentext @@ -133,7 +133,7 @@ PicnickerCindyScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_3, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .CindyUnmasked: faceplayer opentext @@ -167,7 +167,7 @@ CamperBarryScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_4, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .BarryUnmasked: faceplayer opentext diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 9bc8775a6..c74e93c52 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -33,7 +33,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext UnknownText_0x19654e waitbutton @@ -41,7 +41,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX end MovementData_0x196486: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 85b4308f0..5eda492f3 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -58,7 +58,7 @@ MoveTutorScript: writetext UnknownText_0x199042 yesorno iffalse .Refused - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance writetext UnknownText_0x199090 yesorno iffalse .Refused2 @@ -76,21 +76,21 @@ MoveTutorScript: .Flamethrower: writebyte MOVETUTOR_FLAMETHROWER writetext UnknownText_0x1991cf - special Special_MoveTutor + special MoveTutor if_equal FALSE, .TeachMove jump .Incompatible .Thunderbolt: writebyte MOVETUTOR_THUNDERBOLT writetext UnknownText_0x1991cf - special Special_MoveTutor + special MoveTutor if_equal FALSE, .TeachMove jump .Incompatible .IceBeam: writebyte MOVETUTOR_ICE_BEAM writetext UnknownText_0x1991cf - special Special_MoveTutor + special MoveTutor if_equal FALSE, .TeachMove jump .Incompatible @@ -126,7 +126,7 @@ MoveTutorScript: takecoins 4000 waitsfx playsound SFX_TRANSACTION - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance writetext UnknownText_0x19918b waitbutton closetext diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index dbea8e55c..73fef5157 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -65,7 +65,7 @@ ReceptionistScript_0x560ce: if_not_equal SUNDAY, .EventIsOver checkflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN iftrue .EventIsOver - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness writetext UnknownText_0x56143 buttonsound if_greater_than 150 - 1, .VeryHappy @@ -106,12 +106,12 @@ ReceptionistScript_0x560ce: Carrie: faceplayer opentext - special Special_GameboyCheck + special GameboyCheck if_not_equal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver writetext UnknownText_0x56241 waitbutton closetext - special Special_UnlockMysteryGift + special UnlockMysteryGift end .NotGBC: diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 49cd09ebd..e9f9447ce 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -13,7 +13,7 @@ GoldenrodVendingMachine: opentext writetext GoldenrodVendingText .Start: - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight loadmenuheader .MenuHeader verticalmenu closewindow diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index cc04df7fb..30ba8c64a 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -60,7 +60,7 @@ GoldenrodGmeCornerTMVendorScript: iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript writetext GoldenrodGameCornerPrizeVendorWhichPrizeText GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance loadmenuheader GoldenrodGameCornerTMVendorMenuHeader verticalmenu closewindow @@ -161,7 +161,7 @@ GoldenrodGameCornerPrizeMonVendorScript: iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript .loop writetext GoldenrodGameCornerPrizeVendorWhichPrizeText - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance loadmenuheader .MenuHeader verticalmenu closewindow @@ -183,7 +183,7 @@ GoldenrodGameCornerPrizeMonVendorScript: writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton writebyte ABRA - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke ABRA, 5 takecoins 100 jump .loop @@ -201,7 +201,7 @@ GoldenrodGameCornerPrizeMonVendorScript: writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton writebyte CUBONE - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke CUBONE, 15 takecoins 800 jump .loop @@ -219,7 +219,7 @@ GoldenrodGameCornerPrizeMonVendorScript: writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton writebyte WOBBUFFET - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke WOBBUFFET, 15 takecoins 1500 jump .loop @@ -297,20 +297,20 @@ GoldenrodGameCornerSlotsMachineScript: if_equal 0, GoldenrodGameCornerLuckySlotsMachineScript refreshscreen writebyte FALSE - special Special_SlotMachine + special SlotMachine closetext end GoldenrodGameCornerLuckySlotsMachineScript: refreshscreen writebyte TRUE - special Special_SlotMachine + special SlotMachine closetext end GoldenrodGameCornerCardFlipMachineScript: refreshscreen - special Special_CardFlip + special CardFlip closetext end diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 4fa8506dc..da8d67668 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -13,7 +13,7 @@ GoldenrodHappinessRater_MapScripts: TeacherScript_0x54953: faceplayer opentext - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness writetext UnknownText_0x549a3 buttonsound if_greater_than 250 - 1, UnknownScript_0x54973 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index c0f749413..1fd37876a 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -35,7 +35,7 @@ OfficerScript_0x550ec: applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 applymovement PLAYER, MovementData_0x5514f writebyte FALSE - special Special_MagnetTrain + special MagnetTrain warpcheck newloadmap MAPSETUP_TRAIN applymovement PLAYER, .MovementBoardTheTrain diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index d90aed911..ebee5d6a5 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -11,7 +11,7 @@ GoldenrodNameRater_MapScripts: GoldenrodNameRater: faceplayer opentext - special Special_NameRater + special NameRater waitbutton closetext end diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 9402f8743..bb0a19be3 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -17,7 +17,7 @@ NurseScript_0x60f91: GoldenrodPokecenter1F_GSBallSceneLeft: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT - special Special_BattleTowerAction + special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end @@ -49,7 +49,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft: GoldenrodPokecenter1F_GSBallSceneRight: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT - special Special_BattleTowerAction + special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 72ace6fa3..b856c61c4 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -192,7 +192,7 @@ OlderHaircutBrotherScript: .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c5f9 yesorno iffalse .Refused @@ -200,7 +200,7 @@ OlderHaircutBrotherScript: if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x7c69a buttonsound - special Special_YoungerHaircutBrother + special YoungerHaircutBrother if_equal $0, .Refused if_equal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT @@ -228,14 +228,14 @@ OlderHaircutBrotherScript: .then takemoney YOUR_MONEY, 500 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c6b8 waitbutton closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext UnknownText_0x7c6d8 @@ -275,7 +275,7 @@ YoungerHaircutBrotherScript: .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c75c yesorno iffalse .Refused @@ -283,7 +283,7 @@ YoungerHaircutBrotherScript: if_equal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x7c7f1 buttonsound - special Special_OlderHaircutBrother + special OlderHaircutBrother if_equal $0, .Refused if_equal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT @@ -311,14 +311,14 @@ YoungerHaircutBrotherScript: .then takemoney YOUR_MONEY, 300 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c80e waitbutton closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext UnknownText_0x7c82a @@ -349,21 +349,21 @@ YoungerHaircutBrotherScript: UnknownScript_0x7c2bb: writetext HaircutBrosText_SlightlyHappier - special Special_PlayCurMonCry + special PlayCurMonCry waitbutton closetext end UnknownScript_0x7c2c4: writetext HaircutBrosText_Happier - special Special_PlayCurMonCry + special PlayCurMonCry waitbutton closetext end UnknownScript_0x7c2cd: writetext HaircutBrosText_MuchHappier - special Special_PlayCurMonCry + special PlayCurMonCry waitbutton closetext end diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 561ee9df0..e5bbf74cb 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -121,7 +121,7 @@ TeacherScript_0x7ca7d: UndergroundSilverScene1: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_EXIT_BUILDING appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER @@ -140,7 +140,7 @@ UndergroundSilverScene1: UndergroundSilverScene2: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_EXIT_BUILDING appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 3f5f6ee10..2a7e034d5 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -31,7 +31,7 @@ HallOfFame_MapScripts: setscene 1 pause 15 writebyte HEALMACHINE_HALL_OF_FAME - special Special_HealMachineAnim + special HealMachineAnim setevent EVENT_BEAT_ELITE_FOUR setevent EVENT_TELEPORT_GUY setevent EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index e5eff3a32..16fd0bbf0 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -459,18 +459,18 @@ MapIlexForestSignpost4Script: closetext pause 20 showemote EMOTE_SHOCK, PLAYER, 20 - special Special_FadeOutMusic + special FadeOutMusic applymovement PLAYER, MovementData_0x6ef58 pause 30 spriteface PLAYER, DOWN pause 20 clearflag ENGINE_FOREST_IS_RESTLESS - special Special_CelebiShrineEvent + special CelebiShrineEvent loadwildmon CELEBI, 30 startbattle reloadmapafterbattle pause 20 - special Special_CheckCaughtCelebi + special CheckCaughtCelebi iffalse .DidntCatchCelebi appear ILEXFOREST_KURT applymovement ILEXFOREST_KURT, MovementData_0x6ef4e diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 17a4d0663..feb517914 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -58,7 +58,7 @@ PlateauRivalBattle1: appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1 playmusic MUSIC_RIVAL_ENCOUNTER @@ -79,7 +79,7 @@ PlateauRivalBattle2: appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement2 playmusic MUSIC_RIVAL_ENCOUNTER @@ -158,7 +158,7 @@ TeleportGuyScript: waitbutton closetext playsound SFX_WARP_TO - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx warp NEW_BARK_TOWN, 13, 6 end diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 7e7399aa6..c8894a715 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -44,7 +44,7 @@ KurtScript_0x18e178: writetext UnknownText_0x18e473 waitbutton closetext - special Special_FadeOutMusic + special FadeOutMusic setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET checkcode VAR_FACING if_equal UP, .RunAround @@ -131,7 +131,7 @@ KurtScript_0x18e178: writetext UnknownText_0x18e736 buttonsound setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 - special Special_SelectApricornForKurt + special SelectApricornForKurt if_equal FALSE, .Cancel if_equal BLU_APRICORN, .Blu if_equal YLW_APRICORN, .Ylw @@ -291,7 +291,7 @@ KurtScript_0x18e178: setevent EVENT_FOREST_IS_RESTLESS clearevent EVENT_CAN_GIVE_GS_BALL_TO_KURT clearevent EVENT_GAVE_GS_BALL_TO_KURT - special Special_FadeOutMusic + special FadeOutMusic pause 20 showemote EMOTE_SHOCK, KURTSHOUSE_KURT1, 30 checkcode VAR_FACING diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index f8e525971..9ffc9e05c 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -141,7 +141,7 @@ MapLakeOfRageSignpost1Script: UnknownScript_0x700b8: buttonsound - special Special_MagikarpHouseSign + special MagikarpHouseSign closetext end diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index a197dd0e8..b921d38b0 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -40,11 +40,11 @@ UnknownScript_0x19a6d7: UnknownScript_0x19a6e0: writebyte MAGIKARP - special Special_FindPartyMonThatSpecies + special FindPartyMonThatSpecies iffalse UnknownScript_0x19a6d7 writetext UnknownText_0x19a93e waitbutton - special Special_CheckMagikarpLength + special CheckMagikarpLength if_equal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c if_equal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722 if_equal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index a3336251b..a040b0b49 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -44,12 +44,12 @@ LancesRoom_MapScripts: end Script_ApproachLanceFromLeft: - special Special_FadeOutMusic + special FadeOutMusic applymovement PLAYER, MovementData_ApproachLanceFromLeft jump LanceScript_0x180e7b Script_ApproachLanceFromRight: - special Special_FadeOutMusic + special FadeOutMusic applymovement PLAYER, MovementData_ApproachLanceFromRight LanceScript_0x180e7b: spriteface LANCESROOM_LANCE, LEFT @@ -125,7 +125,7 @@ LanceScript_0x180e7b: pause 30 closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth - special Special_FadeOutPalettes + special FadeOutPalettes pause 15 warpfacing UP, HALL_OF_FAME, 4, 13 end diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 544c51d5b..ecb4fb5c0 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -15,7 +15,7 @@ LavenderNameRater_MapScripts: LavenderNameRater: faceplayer opentext - special Special_NameRater + special NameRater waitbutton closetext end diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index d53aabce0..959f6970e 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -53,7 +53,7 @@ UnknownScript_0x190039: UnknownScript_0x190040: opentext writetext UnknownText_0x1900b0 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight yesorno iffalse UnknownScript_0x190072 checkmoney YOUR_MONEY, 300 @@ -63,7 +63,7 @@ UnknownScript_0x190040: waitsfx playsound SFX_TRANSACTION takemoney YOUR_MONEY, 300 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x19014a waitbutton closetext diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index b3ec5a564..456b30446 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -18,7 +18,7 @@ ManiaScript: writetext ManiaText_AskLookAfterShuckle yesorno iffalse .refusetotakeshuckie - special Special_GiveShuckle + special GiveShuckle iffalse .partyfull writetext ManiaText_TakeCareOfShuckle buttonsound @@ -54,7 +54,7 @@ ManiaScript: writetext ManiaText_CanIHaveMyMonBack yesorno iffalse .refused - special Special_ReturnShuckle + special ReturnShuckle if_equal SHUCKIE_WRONG_MON, .wrong if_equal SHUCKIE_REFUSED, .refused if_equal SHUCKIE_HAPPY, .superhappy diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index d65ae1006..391d05bf4 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -21,9 +21,9 @@ MobileBattleRoom_MapScripts: MapMobileBattleRoomSignpost0Script: refreshscreen - special Special_Function1037c2 + special Function1037c2 if_equal $1, .one - special Special_Function1037eb + special Function1037eb iffalse .false if_equal $1, .one_ if_equal $2, .two_ @@ -33,24 +33,24 @@ MapMobileBattleRoomSignpost0Script: writetext MobileBattleRoom_HealText pause 20 closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL - special Special_LoadMapPalettes + special LoadMapPalettes pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic refreshscreen .two_ - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty - special Special_Function10383c + special Function10383c iftrue .false .one - special Special_Function10387b + special Function10387b writetext MobileBattleRoom_EstablishingCommsText waitbutton reloadmappart - special Special_Function101225 + special Function101225 .false closetext end diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 53713c9de..1cf28cb5c 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -21,11 +21,11 @@ MobileTradeRoomMobile_MapScripts: MapMobileTradeRoomMobileSignpost0Script: refreshscreen - special Special_Function1037c2 + special Function1037c2 writetext MobileTradeRoomMobile_EstablishingCommsText waitbutton reloadmappart - special Special_Function101231 + special Function101231 closetext end diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 38e5d436d..f9ac4492d 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -20,7 +20,7 @@ MountMoon_MapScripts: .RivalBattle: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 applymovement MOUNTMOON_SILVER, MountMoonSilverMovementBefore playmusic MUSIC_RIVAL_ENCOUNTER diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 0635be308..5baa81fd9 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -11,7 +11,7 @@ MoveDeletersHouse_MapScripts: MoveDeleter: faceplayer opentext - special Special_MoveDeletion + special MoveDeletion waitbutton closetext end diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index be806d610..4e73195b2 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -110,13 +110,13 @@ MrPokemonsHouse_OakScript: writetext MrPokemonsHouse_MrPokemonHealText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes playmusic MUSIC_HEAL - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty pause 60 - special Special_FadeInQuickly + special FadeInQuickly special RestartMapMusic opentext writetext MrPokemonText_ImDependingOnYou diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index d78641c28..cbfb0d1c1 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -33,7 +33,7 @@ Oak: .CheckPokedex: writetext OakLabDexCheckText waitbutton - special Special_ProfOaksPCBoot + special ProfOaksPCBoot writetext OakLabGoodbyeText waitbutton closetext diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index e2fd0c4c7..923ed4bb4 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -27,7 +27,7 @@ OlivineCity_MapScripts: UnknownScript_0x1a8833: spriteface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_ENTER_DOOR appear OLIVINECITY_OLIVINE_RIVAL @@ -45,13 +45,13 @@ UnknownScript_0x1a8833: disappear OLIVINECITY_OLIVINE_RIVAL special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX end UnknownScript_0x1a886b: spriteface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_ENTER_DOOR appear OLIVINECITY_OLIVINE_RIVAL @@ -69,7 +69,7 @@ UnknownScript_0x1a886b: setscene 1 special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX end OlivineCitySailor1Script: diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index d036dc56f..a54d22916 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -47,9 +47,9 @@ UnknownScript_0x60bab: closetext special RestartMapMusic cry AMPHAROS - special Special_FadeOutPalettes + special FadeOutPalettes pause 10 - special Special_FadeInPalettes + special FadeInPalettes opentext writetext UnknownText_0x60f3d waitbutton @@ -109,7 +109,7 @@ MonsterScript_0x60c3a: iftrue UnknownScript_0x60c51 writetext UnknownText_0x60f03 writebyte AMPHAROS - special Special_PlaySlowCry + special PlaySlowCry buttonsound writetext UnknownText_0x60f19 waitbutton @@ -121,10 +121,10 @@ UnknownScript_0x60c51: cry AMPHAROS waitbutton closetext - special Special_FadeOutPalettes - special Special_FadeInPalettes - special Special_FadeOutPalettes - special Special_FadeInPalettes + special FadeOutPalettes + special FadeInPalettes + special FadeOutPalettes + special FadeInPalettes end OlivineLighthouse6FSuperPotion: diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index ababf8f71..132a0dcc7 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -46,7 +46,7 @@ SailorScript_0x748c0: waitsfx applymovement PLAYER, MovementData_0x74a30 playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7490a diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index a049ace56..0e5d9a73f 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -48,18 +48,18 @@ UnknownScript_0x7a4f6: clearevent EVENT_PLAYERS_HOUSE_MOM_2 writetext UnknownText_0x7a6bd buttonsound - special Special_SetDayOfWeek + special SetDayOfWeek UnknownScript_0x7a519: writetext UnknownText_0x7a742 yesorno iffalse UnknownScript_0x7a52a - special Special_InitialSetDSTFlag + special InitialSetDSTFlag yesorno iffalse UnknownScript_0x7a519 jump UnknownScript_0x7a531 UnknownScript_0x7a52a: - special Special_InitialClearDSTFlag + special InitialClearDSTFlag yesorno iffalse UnknownScript_0x7a519 UnknownScript_0x7a531: @@ -147,7 +147,7 @@ UnknownScript_0x7a5b5: setevent EVENT_FIRST_TIME_BANKING_WITH_MOM UnknownScript_0x7a5b8: setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST - special Special_BankOfMom + special BankOfMom waitbutton closetext end diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 72b2989b6..109b541fc 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -18,7 +18,7 @@ PlayersHouse2F_MapScripts: end .InitializeRoom: - special Special_ToggleDecorationsVisibility + special ToggleDecorationsVisibility setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 checkevent EVENT_INITIALIZED_EVENTS iftrue .SkipInitialization @@ -29,7 +29,7 @@ PlayersHouse2F_MapScripts: return .SetSpawn: - special Special_ToggleMaptileDecorations + special ToggleMaptileDecorations return db 0, 0, 0 ; filler @@ -87,7 +87,7 @@ PlayersHouseBookshelfScript: PlayersHousePCScript: opentext - special Special_PlayersHousePC + special PlayersHousePC iftrue .Warp closetext end diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 89dfe05ba..1aa5e643c 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -11,7 +11,7 @@ PokeSeersHouse_MapScripts: SeerScript: faceplayer opentext - special Special_PokeSeer + special PokeSeer waitbutton closetext end diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index a9a71f8ca..3eea56cc0 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -18,7 +18,7 @@ Pokecenter2F_MapScripts: db 0 .Scene0: - special Special_CheckMysteryGift + special CheckMysteryGift if_equal $0, .Scene0Done clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 @@ -76,28 +76,28 @@ LinkReceptionistScript_Trade: writetext Text_TradeReceptionistIntro yesorno iffalse .Cancel - special Special_Mobile_DummyReturnFalse ; always returns false + special Mobile_DummyReturnFalse ; always returns false iffalse .NoMobile writetext Text_TradeReceptionistMobile - special Special_AskMobileOrCable + special AskMobileOrCable iffalse .Cancel if_equal $1, .Mobile .NoMobile: - special Special_SetBitsForLinkTradeRequest + special SetBitsForLinkTradeRequest writetext Text_PleaseWait - special Special_WaitForLinkedFriend + special WaitForLinkedFriend iffalse .FriendNotReady writetext Text_MustSaveGame yesorno iffalse .DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .DidNotSave writetext Text_PleaseWait - special Special_CheckLinkTimeout + special CheckLinkTimeout iffalse .LinkTimedOut copybytetovar wOtherPlayerLinkMode iffalse .LinkedToFirstGen - special Special_CheckBothSelectedSameRoom + special CheckBothSelectedSameRoom iffalse .IncompatibleRooms writetext Text_PleaseComeIn2 waitbutton @@ -107,21 +107,21 @@ LinkReceptionistScript_Trade: end .FriendNotReady: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end .LinkedToFirstGen: - special Special_FailedLinkToPast + special FailedLinkToPast writetext Text_CantLinkToThePast - special Special_CloseLink + special CloseLink closetext end .IncompatibleRooms: writetext Text_IncompatibleRooms - special Special_CloseLink + special CloseLink closetext end @@ -132,7 +132,7 @@ LinkReceptionistScript_Trade: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit .Cancel: closetext end @@ -151,9 +151,9 @@ LinkReceptionistScript_Trade: writetext Text_MustSaveGame yesorno iffalse .Mobile_DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .Mobile_DidNotSave - special Special_Function1011f1 + special Function1011f1 writetext Text_PleaseComeIn2 waitbutton closetext @@ -178,28 +178,28 @@ LinkReceptionistScript_Battle: writetext Text_BattleReceptionistIntro yesorno iffalse .Cancel - special Special_Mobile_DummyReturnFalse ; always returns false + special Mobile_DummyReturnFalse ; always returns false iffalse .NoMobile writetext Text_BattleReceptionistMobile - special Special_AskMobileOrCable + special AskMobileOrCable iffalse .Cancel if_equal $1, .Mobile .NoMobile: - special Special_SetBitsForBattleRequest + special SetBitsForBattleRequest writetext Text_PleaseWait - special Special_WaitForLinkedFriend + special WaitForLinkedFriend iffalse .FriendNotReady writetext Text_MustSaveGame yesorno iffalse .DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .DidNotSave writetext Text_PleaseWait - special Special_CheckLinkTimeout + special CheckLinkTimeout iffalse .LinkTimedOut copybytetovar wOtherPlayerLinkMode iffalse .LinkedToFirstGen - special Special_CheckBothSelectedSameRoom + special CheckBothSelectedSameRoom iffalse .IncompatibleRooms writetext Text_PleaseComeIn2 waitbutton @@ -209,21 +209,21 @@ LinkReceptionistScript_Battle: end .FriendNotReady: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end .LinkedToFirstGen: - special Special_FailedLinkToPast + special FailedLinkToPast writetext Text_CantLinkToThePast - special Special_CloseLink + special CloseLink closetext end .IncompatibleRooms: writetext Text_IncompatibleRooms - special Special_CloseLink + special CloseLink closetext end @@ -234,7 +234,7 @@ LinkReceptionistScript_Battle: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit .Cancel: closetext end @@ -255,9 +255,9 @@ LinkReceptionistScript_Battle: writetext Text_MustSaveGame yesorno iffalse .Mobile_DidNotSave - special Special_Function103780 + special Function103780 iffalse .Mobile_DidNotSave - special Special_Function1011f1 + special Function1011f1 writetext Text_PleaseComeIn2 waitbutton closetext @@ -271,7 +271,7 @@ LinkReceptionistScript_Battle: end .SelectThreeMons: - special Special_Mobile_SelectThreeMons + special Mobile_SelectThreeMons iffalse .Mobile_DidNotSelect if_equal $1, .Mobile_OK if_equal $2, .Mobile_OK @@ -303,37 +303,37 @@ LinkReceptionistScript_TimeCapsule: iftrue Script_TimeCapsuleClosed checkflag ENGINE_TIME_CAPSULE iftrue Script_TimeCapsuleClosed - special Special_SetBitsForTimeCapsuleRequest + special SetBitsForTimeCapsuleRequest faceplayer opentext writetext Text_TimeCapsuleReceptionistIntro yesorno iffalse .Cancel - special Special_CheckTimeCapsuleCompatibility + special CheckTimeCapsuleCompatibility if_equal $1, .MonTooNew if_equal $2, .MonMoveTooNew if_equal $3, .MonHasMail writetext Text_PleaseWait - special Special_WaitForLinkedFriend + special WaitForLinkedFriend iffalse .FriendNotReady writetext Text_MustSaveGame yesorno iffalse .DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .DidNotSave writetext Text_PleaseWait - special Special_CheckLinkTimeout + special CheckLinkTimeout iffalse .LinkTimedOut copybytetovar wOtherPlayerLinkMode iffalse .OK - special Special_CheckBothSelectedSameRoom + special CheckBothSelectedSameRoom writetext Text_IncompatibleRooms - special Special_CloseLink + special CloseLink closetext end .OK: - special Special_EnterTimeCapsule + special EnterTimeCapsule writetext Text_PleaseComeIn2 waitbutton closetext @@ -342,7 +342,7 @@ LinkReceptionistScript_TimeCapsule: end .FriendNotReady: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end @@ -354,7 +354,7 @@ LinkReceptionistScript_TimeCapsule: .DidNotSave: writetext Text_PleaseComeAgain .Cancel: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit closetext end @@ -374,14 +374,14 @@ LinkReceptionistScript_TimeCapsule: end Script_LeftCableTradeCenter: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkTradeRoom setscene 0 setmapscene TRADE_CENTER, 0 end Script_LeftMobileTradeRoom: - special Special_Function101220 + special Function101220 scall Script_WalkOutOfMobileTradeRoom setscene 0 setmapscene MOBILE_TRADE_ROOM_MOBILE, 0 @@ -394,14 +394,14 @@ Script_WalkOutOfMobileTradeRoom: end Script_LeftCableColosseum: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkBattleRoom setscene 0 setmapscene COLOSSEUM, 0 end Script_LeftMobileBattleRoom: - special Special_Function101220 + special Function101220 scall Script_WalkOutOfMobileBattleRoom setscene 0 setmapscene MOBILE_BATTLE_ROOM, 0 @@ -436,7 +436,7 @@ Pokecenter2F_CheckGender: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_RED << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite @@ -463,7 +463,7 @@ Script_WalkOutOfLinkTradeRoom: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2 @@ -485,7 +485,7 @@ Script_WalkOutOfLinkBattleRoom: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2 @@ -544,7 +544,7 @@ TimeCapsuleScript_CheckPlayerGender: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_RED << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown faceobject PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST setflag ENGINE_KRIS_IN_CABLE_CLUB @@ -558,7 +558,7 @@ TimeCapsuleScript_CheckPlayerGender: end Script_LeftTimeCapsule: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight @@ -573,7 +573,7 @@ Script_LeftTimeCapsule: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown @@ -585,7 +585,7 @@ Script_LeftTimeCapsule: MapPokecenter2FSignpost0Script: refreshscreen - special Special_DisplayLinkRecord + special DisplayLinkRecord closetext end @@ -600,7 +600,7 @@ OfficerScript_0x192c9a: writetext Text_MysteryGiftDeliveryGuy_HereYouGo buttonsound waitsfx - special Special_GetMysteryGiftItem + special GetMysteryGiftItem iffalse .BagIsFull itemnotify setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index eb1561801..64fba2b58 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -34,11 +34,11 @@ GentlemanScript_0x5cd3d: opentext writetext UnknownText_0x5ceba buttonsound - special Special_CheckLuckyNumberShowFlag + special CheckLuckyNumberShowFlag iffalse .skip - special Special_ResetLuckyNumberShowFlag + special ResetLuckyNumberShowFlag .skip - special Special_PrintTodaysLuckyNumber + special PrintTodaysLuckyNumber checkflag ENGINE_LUCKY_NUMBER_SHOW iftrue .GameOver writetext UnknownText_0x5cf3a @@ -53,7 +53,7 @@ GentlemanScript_0x5cd3d: playsound SFX_DEX_FANFARE_20_49 waitsfx buttonsound - special Special_CheckForLuckyNumberWinners + special CheckForLuckyNumberWinners closetext applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce74 opentext diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 605b019aa..2c7c074c1 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -117,7 +117,7 @@ Buena: if_equal 30, UnknownScript_0x5d87f playmusic MUSIC_BUENAS_PASSWORD writetext UnknownText_0x5de35 - special Special_AskRememberPassword + special AskRememberPassword iffalse UnknownScript_0x5d81e writetext UnknownText_0x5de84 waitbutton @@ -134,7 +134,7 @@ UnknownScript_0x5d7be: closetext spriteface RADIOTOWER2F_BUENA, DOWN refreshscreen - special Special_BuenasPassword + special BuenasPassword closetext iffalse UnknownScript_0x5d845 opentext @@ -153,7 +153,7 @@ UnknownScript_0x5d7be: writetext UnknownText_0x5e054 waitbutton closetext - special Special_FadeOutMusic + special FadeOutMusic pause 20 special RestartMapMusic checkcode VAR_BLUECARDBALANCE @@ -182,7 +182,7 @@ UnknownScript_0x5d81e: waitbutton closetext spriteface RADIOTOWER2F_BUENA, RIGHT - special Special_FadeOutMusic + special FadeOutMusic pause 20 special RestartMapMusic end @@ -213,7 +213,7 @@ UnknownScript_0x5d845: waitbutton closetext spriteface RADIOTOWER2F_BUENA, RIGHT - special Special_FadeOutMusic + special FadeOutMusic pause 20 special RestartMapMusic end @@ -316,7 +316,7 @@ ReceptionistScript_0x5d8ff: iffalse UnknownScript_0x5d90f writetext UnknownText_0x5e392 buttonsound - special Special_BuenaPrize + special BuenaPrize closetext end diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 5d452c157..bbea39793 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -95,12 +95,12 @@ RadioTower5FRocketBossScene: writetext RadioTower5FRocketBossAfterText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear RADIOTOWER5F_ROCKET disappear RADIOTOWER5F_ROCKET_GIRL pause 15 - special Special_FadeInQuickly + special FadeInQuickly setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 setevent EVENT_CLEARED_RADIO_TOWER clearflag ENGINE_ROCKETS_IN_RADIO_TOWER diff --git a/maps/Route24.asm b/maps/Route24.asm index afb4a514e..de6c3821a 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -24,15 +24,15 @@ RocketScript_0x1adbfa: opentext writetext UnknownText_0x1addc0 buttonsound - special Special_FadeOutMusic + special FadeOutMusic writetext UnknownText_0x1adee1 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear ROUTE24_ROCKET pause 25 - special Special_FadeInQuickly + special FadeInQuickly playmapmusic end diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index e24f7dcc3..83fe7c738 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -14,13 +14,13 @@ TeacherScript_0x7b125: writetext UnknownText_0x7b14d waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings playmusic MUSIC_HEAL special HealParty pause 60 - special Special_FadeInQuickly + special FadeInQuickly special RestartMapMusic opentext writetext UnknownText_0x7b18b diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 629af1536..c5d0615d1 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -13,7 +13,7 @@ SandstormHouseWoman: opentext checkevent EVENT_GOT_TM37_SANDSTORM iftrue .AlreadyGotItem - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness writetext SandstormHouseWomanText1 buttonsound if_greater_than 150 - 1, .Loyal diff --git a/maps/Route34.asm b/maps/Route34.asm index aeb532ae9..8fadf3c99 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -56,7 +56,7 @@ Route34_MapScripts: DayCareManScript_Outside: faceplayer opentext - special Special_DayCareManOutside + special DayCareManOutside waitbutton closetext if_equal TRUE, .end_fail @@ -77,13 +77,13 @@ DayCareManScript_Outside: DayCareMon1Script: opentext - special Special_DayCareMon1 + special DayCareMon1 closetext end DayCareMon2Script: opentext - special Special_DayCareMon2 + special DayCareMon2 closetext end diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 754591060..e5e590930 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -74,7 +74,7 @@ Route35NationalParkGate_MapScripts: closetext scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 end @@ -95,7 +95,7 @@ OfficerScript_0x6a204: iffalse Route35NationalParkGate_DeclinedToParticipate checkcode VAR_PARTYCOUNT if_greater_than 1, Route35NationalParkGate_LeaveTheRestBehind - special Special_ContestDropOffMons + special ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER Route35NationalParkGate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER @@ -108,12 +108,12 @@ Route35NationalParkGate_OkayToProceed: writetext UnknownText_0x6a3e2 waitbutton closetext - special Special_GiveParkBalls + special GiveParkBalls scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx - special Special_SelectRandomBugContestContestants + special SelectRandomBugContestContestants warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 end @@ -134,12 +134,12 @@ Route35NationalParkGate_LeaveTheRestBehind: if_equal 0, Route35NationalParkGate_NoRoomInBox Route35NationalParkGate_LessThanFullParty: ; 6a27d - special Special_CheckFirstMonIsEgg + special CheckFirstMonIsEgg if_equal TRUE, Route35NationalParkGate_FirstMonIsEgg writetext UnknownText_0x6a4c6 yesorno iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind - special Special_ContestDropOffMons + special ContestDropOffMons iftrue Route35NationalParkGate_FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6a537 diff --git a/maps/Route36.asm b/maps/Route36.asm index cb3cedfed..e0a5d0558 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -94,8 +94,8 @@ DidntCatchSudowoodo: applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN - special Special_LoadUsedSpritesGFX - special Special_RefreshSprites + special LoadUsedSpritesGFX + special RefreshSprites end Route36FloriaScript: diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 537cdedd7..a9d3f72d7 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -75,14 +75,14 @@ Route36NationalParkGate_MapScripts: writetext UnknownText_0x6b2c5 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes scall .CopyContestants disappear ROUTE36NATIONALPARKGATE_OFFICER1 appear ROUTE36NATIONALPARKGATE_OFFICER2 applymovement PLAYER, MovementData_0x6add1 pause 15 - special Special_FadeInQuickly + special FadeInQuickly jumpstd bugcontestresults .GoBackToContest: @@ -91,7 +91,7 @@ Route36NationalParkGate_MapScripts: closetext spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end @@ -156,7 +156,7 @@ Route36OfficerScriptContest: iffalse .DecidedNotToJoinContest checkcode VAR_PARTYCOUNT if_greater_than 1, .LeaveMonsWithOfficer - special Special_ContestDropOffMons + special ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER .ResumeStartingContest: setflag ENGINE_BUG_CONTEST_TIMER @@ -171,12 +171,12 @@ Route36OfficerScriptContest: waitbutton closetext setflag ENGINE_BUG_CONTEST_TIMER - special Special_GiveParkBalls + special GiveParkBalls spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx - special Special_SelectRandomBugContestContestants + special SelectRandomBugContestContestants warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end @@ -186,12 +186,12 @@ Route36OfficerScriptContest: checkcode VAR_BOXSPACE if_equal 0, .BoxFull .ContinueLeavingMons: - special Special_CheckFirstMonIsEgg + special CheckFirstMonIsEgg if_equal TRUE, .FirstMonIsEgg writetext UnknownText_0x6afb0 yesorno iffalse .RefusedToLeaveMons - special Special_ContestDropOffMons + special ContestDropOffMons iftrue .FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6b021 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 682b2dea1..a8e54a7ef 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -52,7 +52,7 @@ MooMoo: iftrue .HappyCow writetext Text_WeakMoo writebyte MILTANK - special Special_PlaySlowCry + special PlaySlowCry buttonsound writetext Text_ItsCryIsWeak checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 9f46263de..b7c3117cf 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -24,7 +24,7 @@ FarmerMScript_SellMilk: checkitem MOOMOO_MILK iftrue FarmerMScript_Milking writetext FarmerMText_BuyMilk - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight yesorno iffalse FarmerMScript_NoSale checkmoney YOUR_MONEY, 500 @@ -32,7 +32,7 @@ FarmerMScript_SellMilk: giveitem MOOMOO_MILK iffalse FarmerMScript_NoRoom takemoney YOUR_MONEY, 500 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight waitsfx playsound SFX_TRANSACTION writetext FarmerMText_GotMilk diff --git a/maps/Route40.asm b/maps/Route40.asm index 6f1c2fef5..05b6f8f36 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -79,7 +79,7 @@ Route40Lass1Script: jumptextfaceplayer Route40Lass1Text PokefanMScript_0x1a61c7: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x1a646a diff --git a/maps/Route45.asm b/maps/Route45.asm index 728fcdb03..8c696973d 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -31,7 +31,7 @@ TrainerBlackbeltKenji: iftrue UnknownScript_0x19e0e4 checkevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19e0cd - special Special_SampleKenjiBreakCountdown + special SampleKenjiBreakCountdown writetext UnknownText_0x19e5e2 waitbutton setevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER @@ -61,7 +61,7 @@ UnknownScript_0x19e0e4: verbosegiveitem PP_UP iffalse UnknownScript_0x19e118 clearevent EVENT_KENJI_ON_BREAK - special Special_SampleKenjiBreakCountdown + special SampleKenjiBreakCountdown jump UnknownScript_0x19e127 UnknownScript_0x19e10c: diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 583dcc8ff..1e244cecc 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -50,7 +50,7 @@ RuinsOfAlphAerodactylChamber_MapScripts: MapRuinsOfAlphAerodactylChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_AERODACTYL - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x58df7 end @@ -84,7 +84,7 @@ MapRuinsOfAlphAerodactylChamberSignpost4Script: opentext writetext UnknownText_0x58e4f writebyte UNOWNWORDS_LIGHT - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -94,7 +94,7 @@ MapRuinsOfAlphAerodactylChamberSignpost5Script: opentext writetext UnknownText_0x58e81 writebyte UNOWNWORDS_LIGHT - special Special_DisplayUnownWords + special DisplayUnownWords closetext end diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index fd1f21ea0..46c340c9f 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -9,7 +9,7 @@ RuinsOfAlphHoOhChamber_MapScripts: callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: - special Special_HoOhChamber + special HoOhChamber checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue .OpenWall end @@ -51,7 +51,7 @@ RuinsOfAlphHoOhChamber_MapScripts: MapRuinsOfAlphHoOhChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_HO_OH - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x585ba end @@ -85,7 +85,7 @@ MapRuinsOfAlphHoOhChamberSignpost4Script: opentext writetext UnknownText_0x58612 writebyte UNOWNWORDS_HO_OH - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -95,7 +95,7 @@ MapRuinsOfAlphHoOhChamberSignpost5Script: opentext writetext UnknownText_0x58644 writebyte UNOWNWORDS_HO_OH - special Special_DisplayUnownWords + special DisplayUnownWords closetext end diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index 96f7af16e..66110d261 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -57,7 +57,7 @@ RuinsOfAlphKabutoChamberReceptionistScript: MapRuinsOfAlphKabutoChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_KABUTO - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x58778 end @@ -122,7 +122,7 @@ MapRuinsOfAlphKabutoChamberSignpost4Script: opentext writetext UnknownText_0x58aa7 writebyte UNOWNWORDS_ESCAPE - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -132,7 +132,7 @@ MapRuinsOfAlphKabutoChamberSignpost5Script: opentext writetext UnknownText_0x58ad9 writebyte UNOWNWORDS_ESCAPE - special Special_DisplayUnownWords + special DisplayUnownWords closetext end diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 6d1892f9e..b99ba1825 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -9,7 +9,7 @@ RuinsOfAlphOmanyteChamber_MapScripts: callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: - special Special_OmanyteChamber + special OmanyteChamber checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue .OpenWall end @@ -51,7 +51,7 @@ RuinsOfAlphOmanyteChamber_MapScripts: MapRuinsOfAlphOmanyteChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_OMANYTE - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x58c36 end @@ -85,7 +85,7 @@ MapRuinsOfAlphOmanyteChamberSignpost4Script: opentext writetext UnknownText_0x58c8e writebyte UNOWNWORDS_WATER - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -95,7 +95,7 @@ MapRuinsOfAlphOmanyteChamberSignpost5Script: opentext writetext UnknownText_0x58cc0 writebyte UNOWNWORDS_WATER - special Special_DisplayUnownWords + special DisplayUnownWords closetext end diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 1595ce59a..184e5349c 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -165,7 +165,7 @@ UnknownScript_0x5925a: UnknownScript_0x59260: writetext UnknownText_0x5982d waitbutton - special Special_UnownPrinter + special UnownPrinter closetext end diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 0d69d2017..ad5b4a8bd 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -37,7 +37,7 @@ OfficerScript_0x18a81e: applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement PLAYER, MovementData_0x18a898 writebyte TRUE - special Special_MagnetTrain + special MagnetTrain warpcheck newloadmap MAPSETUP_TRAIN applymovement PLAYER, .MovementBoardTheTrain diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index d53fdb684..453ac6df5 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -15,7 +15,7 @@ NurseScript_0x18a47d: jumpstd pokecenternurse TeacherScript_0x18a480: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x18a4a3 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 705ca0cc1..7d8c5897f 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -9,7 +9,7 @@ SilverCaveRoom3_MapScripts: db 0 Red: - special Special_FadeOutMusic + special FadeOutMusic faceplayer opentext writetext .Text1 @@ -20,16 +20,16 @@ Red: startbattle dontrestartmapmusic reloadmapafterbattle - special Special_FadeOutMusic + special FadeOutMusic opentext writetext .Text3 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear SILVERCAVEROOM3_RED pause 15 - special Special_FadeInQuickly + special FadeInQuickly pause 30 special HealParty refreshscreen diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 7c2490b45..d2c32b671 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -38,14 +38,14 @@ TrainerGruntM1: writetext TrainerGruntM1WhenTalkText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear SLOWPOKEWELLB1F_ROCKET1 disappear SLOWPOKEWELLB1F_ROCKET2 disappear SLOWPOKEWELLB1F_ROCKET3 disappear SLOWPOKEWELLB1F_ROCKET_GIRL pause 15 - special Special_FadeInQuickly + special FadeInQuickly disappear SLOWPOKEWELLB1F_KURT moveobject SLOWPOKEWELLB1F_KURT, 11, 6 appear SLOWPOKEWELLB1F_KURT @@ -67,7 +67,7 @@ TrainerGruntM1: clearevent EVENT_AZALEA_TOWN_SLOWPOKES clearevent EVENT_KURTS_HOUSE_SLOWPOKE clearevent EVENT_KURTS_HOUSE_KURT_1 - special Special_FadeOutPalettes + special FadeOutPalettes special HealParty pause 15 warp KURTS_HOUSE, 3, 3 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index e160dd872..9e2896992 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -25,7 +25,7 @@ SproutTower3F_MapScripts: UnknownScript_0x184947: spriteface PLAYER, UP showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic playsound SFX_TACKLE playsound SFX_ELEVATOR earthquake 79 @@ -54,11 +54,11 @@ UnknownScript_0x184947: pause 15 closetext playsound SFX_WARP_TO - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear SPROUTTOWER3F_SILVER waitsfx - special Special_FadeInQuickly + special FadeInQuickly setscene 1 special RestartMapMusic end diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index f4705a131..67efc752c 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -448,9 +448,9 @@ ExplodingTrap22: end VoltorbExplodingTrap: - special Special_FadeOutPalettes + special FadeOutPalettes cry VOLTORB - special Special_FadeInPalettes + special FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon VOLTORB, 23 @@ -458,9 +458,9 @@ VoltorbExplodingTrap: end GeodudeExplodingTrap: - special Special_FadeOutPalettes + special FadeOutPalettes cry GEODUDE - special Special_FadeInPalettes + special FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon GEODUDE, 21 @@ -468,9 +468,9 @@ GeodudeExplodingTrap: end KoffingExplodingTrap: - special Special_FadeOutPalettes + special FadeOutPalettes cry KOFFING - special Special_FadeInPalettes + special FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon KOFFING, 21 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index f29337812..bf5a6248f 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -109,7 +109,7 @@ UnknownScript_0x6cfac: writetext UnknownText_0x6d4c6 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear TEAMROCKETBASEB2F_ROCKET1 disappear TEAMROCKETBASEB2F_ROCKET_GIRL @@ -117,7 +117,7 @@ UnknownScript_0x6cfac: disappear TEAMROCKETBASEB2F_ROCKET3 disappear TEAMROCKETBASEB2F_ROCKET4 pause 15 - special Special_FadeInQuickly + special FadeInQuickly setscene 2 clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface TEAMROCKETBASEB2F_LANCE, DOWN @@ -166,11 +166,11 @@ LanceHealsCommon: writetext LanceHealsText1 waitbutton closetext - special Special_FadeOutPalettes - special Special_StubbedTrainerRankings_Healings + special FadeOutPalettes + special StubbedTrainerRankings_Healings playsound SFX_FULL_HEAL special HealParty - special Special_FadeInPalettes + special FadeInPalettes opentext writetext LanceHealsText2 waitbutton diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 7b64414a6..80f4b30e4 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -66,7 +66,7 @@ LanceGetPasswordScript: RocketBaseRival: spriteface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic appear TEAMROCKETBASEB3F_SILVER applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalEnterMovement spriteface PLAYER, LEFT diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 3b6a4971f..c0366f94d 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -20,7 +20,7 @@ TimeCapsule_MapScripts: end .SetWhichChris: - special Special_CableClubCheckWhichChris + special CableClubCheckWhichChris iffalse .Chris2 disappear TIMECAPSULE_CHRIS2 appear TIMECAPSULE_CHRIS1 @@ -37,7 +37,7 @@ TimeCapsule_MapScripts: end MapTimeCapsuleSignpost1Script: - special Special_TimeCapsule + special TimeCapsule newloadmap MAPSETUP_LINKRETURN end diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index cd20d59b2..ac6ca8863 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -33,7 +33,7 @@ TinTower1F_MapScripts: iftrue .GotRainbowWing checkevent EVENT_BEAT_ELITE_FOUR iffalse .FaceBeasts - special Special_BeastsCheck + special BeastsCheck iffalse .FaceBeasts clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 @@ -49,7 +49,7 @@ TinTower1F_MapScripts: iftrue .FoughtSuicune appear TINTOWER1F_SUICUNE writebyte RAIKOU - special Special_MonCheck + special MonCheck iftrue .NoRaikou appear TINTOWER1F_RAIKOU jump .CheckEntei @@ -58,7 +58,7 @@ TinTower1F_MapScripts: disappear TINTOWER1F_RAIKOU .CheckEntei: writebyte ENTEI - special Special_MonCheck + special MonCheck iftrue .NoEntei appear TINTOWER1F_ENTEI jump .BeastsDone @@ -87,7 +87,7 @@ TinTower1F_MapScripts: applymovement PLAYER, TinTowerPlayerMovement1 pause 15 writebyte RAIKOU - special Special_MonCheck + special MonCheck iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1 spriteface PLAYER, LEFT @@ -100,7 +100,7 @@ TinTower1F_MapScripts: waitsfx .Next1: writebyte ENTEI - special Special_MonCheck + special MonCheck iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1 spriteface PLAYER, RIGHT @@ -164,7 +164,7 @@ TinTower1F_MapScripts: playsound SFX_EXIT_BUILDING disappear TINTOWER1F_EUSINE waitsfx - special Special_FadeOutMusic + special FadeOutMusic pause 20 playmapmusic end diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 3479bd180..168abe1e7 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -20,7 +20,7 @@ TradeCenter_MapScripts: end .SetWhichChris: - special Special_CableClubCheckWhichChris + special CableClubCheckWhichChris iffalse .Chris2 disappear TRADECENTER_CHRIS2 appear TRADECENTER_CHRIS1 @@ -37,7 +37,7 @@ TradeCenter_MapScripts: end MapTradeCenterSignpost1Script: - special Special_TradeCenter + special TradeCenter newloadmap MAPSETUP_LINKRETURN end diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index bb6fd4316..3de28611b 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -20,7 +20,7 @@ TrainerHouseReceptionistScript: iftrue .FoughtTooManyTimes writetext TrainerHouseB1FIntroText buttonsound - special Special_TrainerHouse + special TrainerHouse iffalse .GetCal3Name trainertotext CAL, CAL2, MEM_BUFFER_0 jump .GotName @@ -42,7 +42,7 @@ TrainerHouseReceptionistScript: writetext TrainerHouseB1FCalBeforeText waitbutton closetext - special Special_TrainerHouse + special TrainerHouse iffalse .NoSpecialBattle winlosstext TrainerHouseB1FCalBeatenText, 0 setlasttalked TRAINERHOUSEB1F_CHRIS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 978ac943d..92d0ca5e2 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -42,7 +42,7 @@ VermilionCitySuperNerdScript: VermilionSnorlax: opentext - special Special_SnorlaxAwake + special SnorlaxAwake iftrue UnknownScript_0x1aa9ab writetext UnknownText_0x1aab64 waitbutton diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index fa5bb186a..f7f956f43 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -52,7 +52,7 @@ SailorScript_0x74dc4: waitsfx applymovement PLAYER, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 7bc86ec04..44250c783 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -25,7 +25,7 @@ UnknownScript_0x74492: moveobject VICTORYROAD_SILVER, 18, 11 spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear VICTORYROAD_SILVER applymovement VICTORYROAD_SILVER, MovementData_0x74539 @@ -39,7 +39,7 @@ UnknownScript_0x74492: UnknownScript_0x744b5: spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear VICTORYROAD_SILVER applymovement VICTORYROAD_SILVER, MovementData_0x74542 diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index 78c623f48..de6eaef8c 100755 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -274,7 +274,7 @@ CopyMobileEZChatToC608: ; 11c156 jr .copy_string ; 11c1ab -Special_Function11c1ab: ; 11c1ab +Function11c1ab: ; 11c1ab ld a, [hInMenu] push af ld a, $1 diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 0ef0079e5..2ad8fff7b 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -318,7 +318,7 @@ Function10016f: ; 10016f Function10020b: ; 10020b xor a ld [wc303], a - farcall Special_FadeOutPalettes + farcall FadeOutPalettes farcall Function106464 call HideSprites call DelayFrame @@ -2803,7 +2803,7 @@ LoadSelectedPartiesForColosseum: ; 1010f2 ret ; 1011f1 -Special_Function1011f1: ; 1011f1 +Function1011f1: ; 1011f1 ld a, $04 call GetSRAMBank ld a, [$a60c] @@ -2827,20 +2827,20 @@ Special_Function1011f1: ; 1011f1 ret ; 101220 -Special_Function101220: ; 101220 +Function101220: ; 101220 xor a ld [wLinkMode], a ret ; 101225 -Special_Function101225: ; 101225 +Function101225: ; 101225 ld d, 1 ld e, BANK(Jumptable_101297) ld bc, Jumptable_101297 call Function100000 jr Function10123d -Special_Function101231: ; 101231 +Function101231: ; 101231 ld d, 2 ld e, BANK(Jumptable_101297) ld bc, Jumptable_101297 @@ -2871,7 +2871,7 @@ Function101251: ; 101251 call Function1021e0 call Function1020ea ret c - call Special_Function102142 + call Function102142 ret ; 101265 @@ -5024,7 +5024,7 @@ Function102112: ; 102112 ret ; 102142 -Special_Function102142: ; 102142 +Function102142: ; 102142 call Function10218d call Function102180 ld hl, UnknownText_0x1021d1 @@ -7722,9 +7722,9 @@ Unknown_1035d7: ; 1035d7 dw Unknown_103608 dw Unknown_103608 dw Unknown_1035fe - dw Special_AskMobileOrCable - dw Special_AskMobileOrCable - dw Special_AskMobileOrCable + dw AskMobileOrCable + dw AskMobileOrCable + dw AskMobileOrCable Unknown_1035e7: ; 1035e7 dwcoord 0, 6 @@ -7755,7 +7755,7 @@ Unknown_103608: ; 103608 db 2, 2, 3 ; 103612 -Special_AskMobileOrCable: ; 103612 +AskMobileOrCable: ; 103612 ld hl, MenuHeader_103640 call LoadMenuHeader ld a, [wMobileOrCable_LastSelection] @@ -7811,7 +7811,7 @@ Function103654: ; 103654 ret ; 10366e -Special_Mobile_SelectThreeMons: ; 10366e +Mobile_SelectThreeMons: ; 10366e farcall Mobile_AlwaysReturnNotCarry bit 7, c jr z, .asm_10369b @@ -7979,7 +7979,7 @@ UnknownText_0x10377b: ; 0x10377b db "@" ; 0x103780 -Special_Function103780: ; 103780 +Function103780: ; 103780 ld a, [wd265] push af call Function10378c @@ -8021,7 +8021,7 @@ Function10378c: ; 10378c ret ; 1037c2 -Special_Function1037c2: ; 1037c2 +Function1037c2: ; 1037c2 call Function103823 jr c, .nope ld a, [wdc5f] @@ -8047,7 +8047,7 @@ UnknownText_0x1037e6: ; 0x1037e6 db "@" ; 0x1037eb -Special_Function1037eb: ; 1037eb +Function1037eb: ; 1037eb call Function103823 jr nc, .asm_103807 ld hl, UnknownText_0x103819 @@ -8102,7 +8102,7 @@ Function103823: ; 103823 ret ; 10383c -Special_Function10383c: ; 10383c +Function10383c: ; 10383c ld a, $01 ld [wdc60], a xor a @@ -8135,7 +8135,7 @@ UnknownText_0x103876: ; 0x103876 db "@" ; 0x10387b -Special_Function10387b: ; 10387b +Function10387b: ; 10387b farcall Mobile_AlwaysReturnNotCarry bit 7, c ret nz diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index e51ab3eea..57692d8a8 100755 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -324,7 +324,7 @@ StubbedTrainerRankings_FruitPicked: ; 10609b ld hl, sTrainerRankingFruitPicked jp StubbedTrainerRankings_Increment3Byte -Special_StubbedTrainerRankings_Healings: ; 1060a2 +StubbedTrainerRankings_Healings: ; 1060a2 ret ld hl, sTrainerRankingHealings jp StubbedTrainerRankings_Increment3Byte @@ -812,7 +812,7 @@ endr ; functions related to the cable club and various NPC scripts referencing communications -Special_Mobile_DummyReturnFalse: ; 10630f +Mobile_DummyReturnFalse: ; 10630f xor a ld [ScriptVar], a ret @@ -838,7 +838,7 @@ Mobile_AlwaysReturnNotCarry: ; 10632f or a ret -Function106331: ; 106331 - called by Special_Mobile_DummyReturnFalse in Crystal-J +Function106331: ; 106331 - called by Mobile_DummyReturnFalse in Crystal-J ; check ~[4:b000] == [7:a800] ld a, $4 call GetSRAMBank diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 882f86aa4..b3b6fef12 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -6837,7 +6837,7 @@ Unknown_117356: ; 117356 SECTION "Mobile Stadium", ROMX -Special_GiveOddEgg: ; 117656 +GiveOddEgg: ; 117656 farcall _GiveOddEgg ret diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 01c505601..fae3f099f 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1672,7 +1672,7 @@ Function118ded: ; 118ded push af ld a, $1 ld [rSVBK], a - farcall Special_Function11b93b + farcall Function11b93b pop af ld [rSVBK], a @@ -5722,7 +5722,7 @@ Text_ThisBattleRoomPleaseWait: ; 0x11ac1f done ; 0x11ac3e -Special_Function11ac3e: ; 11ac3e +Function11ac3e: ; 11ac3e call SpeechTextBox call FadeToMenu callfar ClearSpriteAnims2 @@ -7050,7 +7050,7 @@ Function11b3d9: ; 11b3d9 ret ; 11b444 -Special_Function11b444: ; 11b444 +Function11b444: ; 11b444 ; special call Mobile46_InitJumptable call Mobile46_RunJumptable @@ -7339,7 +7339,7 @@ Function11b5e7: ; 11b5e7 ret ; 11b5e8 -Special_Function11b5e8: ; 11b5e8 +Function11b5e8: ; 11b5e8 ld a, $0 call GetSRAMBank ld hl, wRTC @@ -7575,7 +7575,7 @@ Function11b6b4: ; 11b6b4 ret ; 11b7e5 -Special_Function11b7e5: ; 11b7e5 +Function11b7e5: ; 11b7e5 ld a, [$c60d] ; species ld [wOTTrademonSpecies], a ld [CurPartySpecies], a @@ -7634,7 +7634,7 @@ Special_Function11b7e5: ; 11b7e5 ret ; 11b879 -Special_Function11b879: ; 11b879 +Function11b879: ; 11b879 farcall BattleTower_CheckSaveFileExistsAndIsYours ld a, [ScriptVar] and a @@ -7727,7 +7727,7 @@ Special_Function11b879: ; 11b879 ret ; 11b920 -Special_Function11b920: ; 11b920 +Function11b920: ; 11b920 call Mobile46_InitJumptable ld a, $5 call GetSRAMBank @@ -7740,7 +7740,7 @@ Special_Function11b920: ; 11b920 ret ; 11b93b -Special_Function11b93b: ; 11b93b +Function11b93b: ; 11b93b ld a, $5 call GetSRAMBank xor a @@ -7884,7 +7884,7 @@ AddMobileMonToParty: ; 11b98f ret ; 11ba38 -Special_Function11ba38: ; 11ba38 +Function11ba38: ; 11ba38 farcall CheckCurPartyMonFainted ret c xor a diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 9d9a674dd..9588802f1 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -435,7 +435,7 @@ Function17d1f1: ; 17d1f1 ; if [ScriptVar] == TRUE ; Show BattleTower-Menu with 3 options in english language ; - Challenge - Explanation - Cancel -Special_Menu_ChallengeExplanationCancel: ; 17d224 +Menu_ChallengeExplanationCancel: ; 17d224 ld a, [ScriptVar] and a jr nz, .English @@ -511,7 +511,7 @@ MenuData_ChallengeExplanationCancel: ; 17d297 db "Cancel@" ; 17d2b6 -Special_Function17d2b6: ; 17d2b6 +Function17d2b6: ; 17d2b6 call Function17d2c0 farcall Function1181da ret @@ -526,7 +526,7 @@ Function17d2c0: ; 17d2c0 ret ; 17d2ce -Special_Function17d2ce: ; 17d2ce +Function17d2ce: ; 17d2ce ld a, $5 call GetSRAMBank ld a, [$aa72] @@ -4586,7 +4586,7 @@ Function17f524: ; 17f524 jr .asm_17f536 ; 17f53d -Special_BattleTowerMobileError: ; 17f53d +BattleTowerMobileError: ; 17f53d call FadeToMenu xor a ld [wc303], a diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index 4c7a20b3d..eb52eb981 100755 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -845,7 +845,7 @@ Function4a6ab: ; 4a6ab (12:66ab) call ClearBGPalettes ld b, SCGB_DIPLOMA call GetSGBLayout - farcall Special_Function11c1ab + farcall Function11c1ab pop bc call LoadFontsExtra jp Function4a4c4 |