diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2018-01-02 17:13:57 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2018-01-02 17:13:57 +0100 |
| commit | f1ea15bbfe8528143ace793b050891a9b1f99d03 (patch) | |
| tree | 0a4644b24aaf3a09dee22e2f338ec324cb5b940c /maps | |
| parent | 7c0e903c4821b3e7ded9b795661ed3608e023cc2 (diff) | |
Consolidate Special function names
Diffstat (limited to 'maps')
42 files changed, 105 insertions, 105 deletions
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index acd8bfa66..f2e5f1116 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -33,7 +33,7 @@ Script_BattleRoomLoop: ; 0x9f425 buttonsound closetext special BattleTowerBattle ; calls predef startbattle - special FadeOutPalettes + special 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 FadeOutPalettes + special Special_FadeOutPalettes special LoadMapPalettes pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic opentext writetext Text_NextUpOpponentNo @@ -75,7 +75,7 @@ Script_DontBattleNextOpponent: ; 0x9f483 special BattleTowerAction playsound SFX_SAVE waitsfx - special FadeOutPalettes + special Special_FadeOutPalettes special Reset Script_DontSaveAndEndTheSession: ; 0x9f4a3 writetext Text_CancelYourBattleRoomChallenge @@ -86,7 +86,7 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3 writebyte BATTLETOWERACTION_06 special BattleTowerAction closetext - special FadeOutPalettes + special Special_FadeOutPalettes warpfacing UP, BATTLE_TOWER_1F, $7, $7 opentext jump Script_BattleTowerHopeToServeYouAgain diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 9a40a68f6..6cd7f460d 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -33,14 +33,14 @@ DaisyScript: writetext DaisyAlrightText waitbutton closetext - special FadeOutPalettes + special Special_FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic opentext writetext GroomedMonLooksContentText - special PlayCurMonCry + special Special_PlayCurMonCry buttonsound writetext DaisyAllDoneText waitbutton diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 07f5c3d6e..536c0172b 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -83,7 +83,7 @@ ReleaseTheBeasts: special RestartMapMusic setscene $1 setevent EVENT_RELEASED_THE_BEASTS - special InitRoamMons + special 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 c94ef993e..a86bbaf66 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -24,7 +24,7 @@ CeladonDeptStore6FVendingMachine: opentext writetext CeladonVendingText .Start: - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight loadmenudata .MenuData verticalmenu closewindow diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 3a20c63e6..040c7dd98 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -16,7 +16,7 @@ FishingGuruScript_0x9e0e0: iffalse UnknownScript_0x9e0f3 writetext UnknownText_0x9e142 waitbutton - special PhotoStudio + special Special_PhotoStudio waitbutton closetext end diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 5456973dc..8d378a820 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -46,7 +46,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Default_Merge_1: - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX checkevent EVENT_RETURNED_MACHINE_PART iftrue .TalkAboutLostItem opentext @@ -70,7 +70,7 @@ Copycat: .Default_Merge_3a: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX opentext writetext CopycatText_QuickMimicking waitbutton @@ -99,7 +99,7 @@ Copycat: .Default_Merge_3b: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX opentext writetext CopycatText_Worried waitbutton @@ -142,7 +142,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .GotPass_Merge_1: - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_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 MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX opentext writetext CopycatText_ItsAScream waitbutton diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 491aaff7b..a46a6316a 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -91,7 +91,7 @@ EcruteakGymClosed: follow PLAYER, ECRUTEAKGYM_GRAMPS applymovement PLAYER, MovementData_0x99e5f stopfollow - special FadeOutPalettes + special Special_FadeOutPalettes playsound SFX_ENTER_DOOR waitsfx warp ECRUTEAK_CITY, $6, $1b diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 13c8b367e..754222323 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -312,7 +312,7 @@ ElmsLabHealingMachine_HealParty: special HealParty playmusic MUSIC_NONE writebyte 1 ; Machine is in Elm's Lab - special HealMachineAnim + special Special_HealMachineAnim pause 30 special RestartMapMusic closetext @@ -556,7 +556,7 @@ CopScript: opentext writetext ElmsLabOfficerText1 buttonsound - special SpecialNameRival + special Special_NameRival writetext ElmsLabOfficerText2 waitbutton closetext diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 869cb147c..f08a75cc1 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -68,7 +68,7 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special 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 FadeOutPalettes + special Special_FadeOutPalettes waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY setmapscene OLIVINE_PORT, $1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 8aaf6e364..505f5ca53 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 MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_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 MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_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 MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_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 MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_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 MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX .BarryUnmasked: faceplayer opentext diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index eca4aa8e0..f82fbb26e 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 MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_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 MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX end MovementData_0x196486: diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 70e7ab046..e183d81bb 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -65,7 +65,7 @@ ReceptionistScript_0x560ce: if_not_equal SUNDAY, .EventIsOver checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT iftrue .EventIsOver - special GetFirstPokemonHappiness + special Special_GetFirstPokemonHappiness writetext UnknownText_0x56143 buttonsound if_greater_than $95, .VeryHappy @@ -106,7 +106,7 @@ ReceptionistScript_0x560ce: Carrie: faceplayer opentext - special SpecialGameboyCheck + special Special_GameboyCheck if_not_equal $2, .NotGBC ; This is a dummy check from Gold and Silver. In normal gameplay, this would not be checked. writetext UnknownText_0x56241 waitbutton diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 82d04ccc8..c84b29cae 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -13,7 +13,7 @@ GoldenrodVendingMachine: opentext writetext GoldenrodVendingText .Start: - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight loadmenudata .MenuData verticalmenu closewindow diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 667698662..cf560c8dd 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -13,7 +13,7 @@ GoldenrodHappinessRater_MapScriptHeader: TeacherScript_0x54953: faceplayer opentext - special GetFirstPokemonHappiness + special Special_GetFirstPokemonHappiness writetext UnknownText_0x549a3 buttonsound if_greater_than $f9, UnknownScript_0x54973 diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index 259e0fbb7..23d641d10 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -11,7 +11,7 @@ GoldenrodNameRater_MapScriptHeader: GoldenrodNameRater: faceplayer opentext - special SpecialNameRater + special Special_NameRater waitbutton closetext end diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index debf98bfa..8408079ad 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -192,7 +192,7 @@ OlderHaircutBrotherScript: .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight writetext UnknownText_0x7c5f9 yesorno iffalse .Refused @@ -228,14 +228,14 @@ OlderHaircutBrotherScript: .then takemoney $0, 500 - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight writetext UnknownText_0x7c6b8 waitbutton closetext - special FadeOutPalettes + special Special_FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic opentext writetext UnknownText_0x7c6d8 @@ -275,7 +275,7 @@ YoungerHaircutBrotherScript: .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight writetext UnknownText_0x7c75c yesorno iffalse .Refused @@ -311,14 +311,14 @@ YoungerHaircutBrotherScript: .then takemoney $0, 300 - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight writetext UnknownText_0x7c80e waitbutton closetext - special FadeOutPalettes + special Special_FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic opentext writetext UnknownText_0x7c82a @@ -349,21 +349,21 @@ YoungerHaircutBrotherScript: UnknownScript_0x7c2bb: writetext HaircutBrosText_SlightlyHappier - special PlayCurMonCry + special Special_PlayCurMonCry waitbutton closetext end UnknownScript_0x7c2c4: writetext HaircutBrosText_Happier - special PlayCurMonCry + special Special_PlayCurMonCry waitbutton closetext end UnknownScript_0x7c2cd: writetext HaircutBrosText_MuchHappier - special PlayCurMonCry + special Special_PlayCurMonCry waitbutton closetext end diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index c9bfdac9d..7596802a8 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -31,7 +31,7 @@ HallOfFame_MapScriptHeader: setscene $1 pause 15 writebyte 2 ; Machine is in the Hall of Fame - special HealMachineAnim + special Special_HealMachineAnim setevent EVENT_BEAT_ELITE_FOUR setevent EVENT_TELEPORT_GUY setevent EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 879e1dd8b..e6d46fbe8 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -158,7 +158,7 @@ TeleportGuyScript: waitbutton closetext playsound SFX_WARP_TO - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx warp NEW_BARK_TOWN, $d, $6 end diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 65d5fdaee..c36a19d17 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -17,7 +17,7 @@ KrissHouse2F_MapScriptHeader: end .InitializeRoom: - special ToggleDecorationsVisibility + special Special_ToggleDecorationsVisibility setevent EVENT_IN_YOUR_ROOM checkevent EVENT_INITIALIZED_EVENTS iftrue .SkipInizialization @@ -28,7 +28,7 @@ KrissHouse2F_MapScriptHeader: return .SetSpawn: - special ToggleMaptileDecorations + special Special_ToggleMaptileDecorations return diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index f185af0dc..db14274f5 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -125,7 +125,7 @@ LanceScript_0x180e7b: pause 30 closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth - special FadeOutPalettes + special Special_FadeOutPalettes pause 15 warpfacing UP, HALL_OF_FAME, $4, $d end diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index d41354143..9b7435312 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -15,7 +15,7 @@ LavenderNameRater_MapScriptHeader: LavenderNameRater: faceplayer opentext - special SpecialNameRater + special Special_NameRater waitbutton closetext end diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index ba907383d..dad47275a 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -53,7 +53,7 @@ UnknownScript_0x190039: UnknownScript_0x190040: opentext writetext UnknownText_0x1900b0 - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight yesorno iffalse UnknownScript_0x190072 checkmoney $0, 300 @@ -63,7 +63,7 @@ UnknownScript_0x190040: waitsfx playsound SFX_TRANSACTION takemoney $0, 300 - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight writetext UnknownText_0x19014a waitbutton closetext diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index d60d1081d..d4ce0d46e 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -18,7 +18,7 @@ ManiaScript: writetext ManiaText_AskLookAfterShuckle yesorno iffalse .refusetotakeshuckie - special SpecialGiveShuckle + special Special_GiveShuckle iffalse .partyfull writetext ManiaText_TakeCareOfShuckle buttonsound @@ -54,7 +54,7 @@ ManiaScript: writetext ManiaText_CanIHaveMyMonBack yesorno iffalse .refused - special SpecialReturnShuckle + special Special_ReturnShuckle if_equal $0, .wrong if_equal $1, .refused if_equal $3, .superhappy diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 870321f3d..2073a7eda 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -33,11 +33,11 @@ MapMobileBattleRoomSignpost0Script: writetext MobileBattleRoom_HealText pause 20 closetext - special FadeOutPalettes + special Special_FadeOutPalettes playmusic MUSIC_HEAL special LoadMapPalettes pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic refreshscreen $0 .two_ diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index a6a50d2dd..c51f0a9e1 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -11,7 +11,7 @@ MoveDeletersHouse_MapScriptHeader: MoveDeleter: faceplayer opentext - special MoveDeletion + special Special_MoveDeletion waitbutton closetext end diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 17da0485d..1fb30c187 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -33,7 +33,7 @@ Oak: .CheckPokedex: writetext OakLabDexCheckText waitbutton - special ProfOaksPCBoot + special Special_ProfOaksPCBoot writetext OakLabGoodbyeText waitbutton closetext diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 2e5129bc5..d90d2900e 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -45,7 +45,7 @@ UnknownScript_0x1a8833: disappear OLIVINECITY_OLIVINE_RIVAL special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX end UnknownScript_0x1a886b: @@ -69,7 +69,7 @@ UnknownScript_0x1a886b: setscene $1 special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX end OlivineCitySailor1Script: diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 686764bfd..e0bd4febf 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -47,9 +47,9 @@ UnknownScript_0x60bab: closetext special RestartMapMusic cry AMPHAROS - special FadeOutPalettes + special Special_FadeOutPalettes pause 10 - special FadeInPalettes + special Special_FadeInPalettes opentext writetext UnknownText_0x60f3d waitbutton @@ -109,7 +109,7 @@ MonsterScript_0x60c3a: iftrue UnknownScript_0x60c51 writetext UnknownText_0x60f03 writebyte AMPHAROS - special PlaySlowCry + special Special_PlaySlowCry buttonsound writetext UnknownText_0x60f19 waitbutton @@ -121,10 +121,10 @@ UnknownScript_0x60c51: cry AMPHAROS waitbutton closetext - special FadeOutPalettes - special FadeInPalettes - special FadeOutPalettes - special FadeInPalettes + special Special_FadeOutPalettes + special Special_FadeInPalettes + special Special_FadeOutPalettes + special Special_FadeInPalettes end OlivineLighthouse6FSuperPotion: diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index f34281e43..505334afb 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 FadeOutPalettes + special Special_FadeOutPalettes waitsfx checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7490a diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index ece34605d..79b526cda 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -107,7 +107,7 @@ LinkReceptionistScript_Trade: end .FriendNotReady: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end @@ -132,7 +132,7 @@ LinkReceptionistScript_Trade: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit .Cancel: closetext end @@ -209,7 +209,7 @@ LinkReceptionistScript_Battle: end .FriendNotReady: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end @@ -234,7 +234,7 @@ LinkReceptionistScript_Battle: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit .Cancel: closetext end @@ -342,7 +342,7 @@ LinkReceptionistScript_TimeCapsule: end .FriendNotReady: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end @@ -354,7 +354,7 @@ LinkReceptionistScript_TimeCapsule: .DidNotSave: writetext Text_PleaseComeAgain .Cancel: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit closetext end @@ -374,7 +374,7 @@ LinkReceptionistScript_TimeCapsule: end Script_LeftCableTradeCenter: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit scall Script_WalkOutOfLinkTradeRoom setscene $0 setmapscene TRADE_CENTER, $0 @@ -394,7 +394,7 @@ Script_WalkOutOfMobileTradeRoom: end Script_LeftCableColosseum: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit scall Script_WalkOutOfLinkBattleRoom setscene $0 setmapscene COLOSSEUM, $0 @@ -558,7 +558,7 @@ TimeCapsuleScript_CheckPlayerGender: end Script_LeftTimeCapsule: - special WaitForOtherPlayerToExit + special Special_WaitForOtherPlayerToExit checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index e66f41f4e..4fc874439 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -13,7 +13,7 @@ SandstormHouseWoman: opentext checkevent EVENT_GOT_TM37_SANDSTORM iftrue .AlreadyGotItem - special GetFirstPokemonHappiness + special Special_GetFirstPokemonHappiness writetext SandstormHouseWomanText1 buttonsound if_greater_than $95, .Loyal diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index cf68bbcc2..8b18e3838 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -74,7 +74,7 @@ Route35NationalParkGate_MapScriptHeader: closetext scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f end @@ -95,7 +95,7 @@ OfficerScript_0x6a204: iffalse Route35NationalParkGate_DeclinedToParticipate checkcode VAR_PARTYCOUNT if_greater_than $1, Route35NationalParkGate_LeaveTheRestBehind - special ContestDropOffMons + special Special_ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER Route35NationalParkGate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER @@ -111,7 +111,7 @@ Route35NationalParkGate_OkayToProceed: special Special_GiveParkBalls scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx special Special_SelectRandomBugContestContestants warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f @@ -134,12 +134,12 @@ Route35NationalParkGate_LeaveTheRestBehind: if_equal 0, Route35NationalParkGate_NoRoomInBox Route35NationalParkGate_LessThanFullParty: ; 6a27d - special CheckFirstMonIsEgg + special Special_CheckFirstMonIsEgg if_equal $1, Route35NationalParkGate_FirstMonIsEgg writetext UnknownText_0x6a4c6 yesorno iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind - special ContestDropOffMons + special 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 4076725b4..26026370f 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -94,7 +94,7 @@ DidntCatchSudowoodo: applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN - special MapCallbackSprites_LoadUsedSpritesGFX + special Special_MapCallbackSprites_LoadUsedSpritesGFX special RefreshSprites end diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 88d7abb14..05bba8674 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -91,7 +91,7 @@ Route36NationalParkGate_MapScriptHeader: closetext spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 end @@ -156,7 +156,7 @@ Route36OfficerScriptContest: iffalse .DecidedNotToJoinContest checkcode VAR_PARTYCOUNT if_greater_than $1, .LeaveMonsWithOfficer - special ContestDropOffMons + special Special_ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER .ResumeStartingContest: setflag ENGINE_BUG_CONTEST_TIMER @@ -174,7 +174,7 @@ Route36OfficerScriptContest: special Special_GiveParkBalls spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx special Special_SelectRandomBugContestContestants warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 @@ -186,12 +186,12 @@ Route36OfficerScriptContest: checkcode VAR_BOXSPACE if_equal $0, .BoxFull .ContinueLeavingMons: - special CheckFirstMonIsEgg + special Special_CheckFirstMonIsEgg if_equal $1, .FirstMonIsEgg writetext UnknownText_0x6afb0 yesorno iffalse .RefusedToLeaveMons - special ContestDropOffMons + special 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 a7cfe5405..6234a9cf4 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -52,7 +52,7 @@ MooMoo: iftrue .HappyCow writetext Text_WeakMoo writebyte MILTANK - special PlaySlowCry + special Special_PlaySlowCry buttonsound writetext Text_ItsCryIsWeak checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 77531a70d..7677976fe 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 PlaceMoneyTopRight + special Special_PlaceMoneyTopRight yesorno iffalse FarmerMScript_NoSale checkmoney $0, 500 @@ -32,7 +32,7 @@ FarmerMScript_SellMilk: giveitem MOOMOO_MILK iffalse FarmerMScript_NoRoom takemoney $0, 500 - special PlaceMoneyTopRight + special Special_PlaceMoneyTopRight waitsfx playsound SFX_TRANSACTION writetext FarmerMText_GotMilk diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index c4357abf1..4a63f1816 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -67,7 +67,7 @@ TrainerGruntM1: clearevent EVENT_AZALEA_TOWN_SLOWPOKES clearevent EVENT_KURTS_HOUSE_SLOWPOKE clearevent EVENT_KURTS_HOUSE_KURT_1 - special FadeOutPalettes + special Special_FadeOutPalettes special HealParty pause 15 warp KURTS_HOUSE, $3, $3 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 464215210..3f66d10a5 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -448,9 +448,9 @@ ExplodingTrap22: end VoltorbExplodingTrap: - special FadeOutPalettes + special Special_FadeOutPalettes cry VOLTORB - special FadeInPalettes + special Special_FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon VOLTORB, 23 @@ -458,9 +458,9 @@ VoltorbExplodingTrap: end GeodudeExplodingTrap: - special FadeOutPalettes + special Special_FadeOutPalettes cry GEODUDE - special FadeInPalettes + special Special_FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon GEODUDE, 21 @@ -468,9 +468,9 @@ GeodudeExplodingTrap: end KoffingExplodingTrap: - special FadeOutPalettes + special Special_FadeOutPalettes cry KOFFING - special FadeInPalettes + special Special_FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon KOFFING, 21 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 0ed2c67f0..ebfc223d9 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -166,11 +166,11 @@ LanceHealsCommon: writetext LanceHealsText1 waitbutton closetext - special FadeOutPalettes + special Special_FadeOutPalettes special TrainerRankings_Healings playsound SFX_FULL_HEAL special HealParty - special FadeInPalettes + special Special_FadeInPalettes opentext writetext LanceHealsText2 waitbutton diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index c4219a991..73f22a1e7 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -20,7 +20,7 @@ TrainerHouseReceptionistScript: iftrue .FoughtTooManyTimes writetext TrainerHouseB1FIntroText buttonsound - special SpecialTrainerHouse + special Special_TrainerHouse iffalse .GetCal3Name trainertotext CAL, CAL2, $0 jump .GotName @@ -42,7 +42,7 @@ TrainerHouseReceptionistScript: writetext TrainerHouseB1FCalBeforeText waitbutton closetext - special SpecialTrainerHouse + special Special_TrainerHouse iffalse .NoSpecialBattle winlosstext TrainerHouseB1FCalBeatenText, 0 setlasttalked TRAINERHOUSEB1F_CHRIS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 90baf28b0..8ae3aeafd 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -42,7 +42,7 @@ VermilionCitySuperNerdScript: VermilionSnorlax: opentext - special SpecialSnorlaxAwake + special Special_SnorlaxAwake iftrue UnknownScript_0x1aa9ab writetext UnknownText_0x1aab64 waitbutton diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 8d7af46a8..ca534987c 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 FadeOutPalettes + special Special_FadeOutPalettes waitsfx setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND |
