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 /engine/events | |
| parent | 7c0e903c4821b3e7ded9b795661ed3608e023cc2 (diff) | |
Consolidate Special function names
Diffstat (limited to 'engine/events')
| -rwxr-xr-x | engine/events/bug_contest/contest_2.asm | 4 | ||||
| -rwxr-xr-x | engine/events/bug_contest/judging.asm | 2 | ||||
| -rwxr-xr-x | engine/events/field_moves.asm | 4 | ||||
| -rwxr-xr-x | engine/events/halloffame.asm | 4 | ||||
| -rwxr-xr-x | engine/events/happiness_egg.asm | 4 | ||||
| -rwxr-xr-x | engine/events/heal_machine_anim.asm | 2 | ||||
| -rwxr-xr-x | engine/events/itemfinder.asm | 4 | ||||
| -rwxr-xr-x | engine/events/magnet_train.asm | 2 | ||||
| -rwxr-xr-x | engine/events/misc_scripts.asm | 2 | ||||
| -rw-r--r-- | engine/events/move_deleter.asm | 2 | ||||
| -rwxr-xr-x | engine/events/overworld.asm | 36 | ||||
| -rw-r--r-- | engine/events/poisonstep_pals.asm | 4 | ||||
| -rwxr-xr-x | engine/events/pokecenter_pc.asm | 4 | ||||
| -rwxr-xr-x | engine/events/print_photo.asm | 2 | ||||
| -rwxr-xr-x | engine/events/prof_oaks_pc.asm | 4 | ||||
| -rwxr-xr-x | engine/events/sacred_ash.asm | 12 | ||||
| -rwxr-xr-x | engine/events/special.asm | 4 | ||||
| -rwxr-xr-x | engine/events/squirtbottle.asm | 2 | ||||
| -rw-r--r-- | engine/events/std_scripts.asm | 22 | ||||
| -rwxr-xr-x | engine/events/sweet_scent.asm | 2 | ||||
| -rwxr-xr-x | engine/events/whiteout.asm | 4 |
21 files changed, 63 insertions, 63 deletions
diff --git a/engine/events/bug_contest/contest_2.asm b/engine/events/bug_contest/contest_2.asm index 493c69d0c..20766185b 100755 --- a/engine/events/bug_contest/contest_2.asm +++ b/engine/events/bug_contest/contest_2.asm @@ -87,7 +87,7 @@ BugCatchingContestantEventFlagTable: ; 139fe dw EVENT_BUG_CATCHING_CONTESTANT_10A ; 13a12 -ContestDropOffMons: ; 13a12 +Special_ContestDropOffMons: ; 13a12 ld hl, PartyMon1HP ld a, [hli] or [hl] @@ -112,7 +112,7 @@ ContestDropOffMons: ; 13a12 ret ; 13a31 -ContestReturnMons: ; 13a31 +Special_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 901ae88fa..8e4b063d6 100755 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -1,4 +1,4 @@ -_BugContestJudging: ; 1369d +_Special_BugContestJudging: ; 1369d call ContestScore farcall TrainerRankings_BugContestScore call BugContest_JudgeContestants diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index a1a2e2e79..40a47fe28 100755 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -7,7 +7,7 @@ PlayWhirlpoolSound: ; 8c7d4 ; 8c7e1 BlindingFlash: ; 8c7e1 - farcall FadeOutPalettes + farcall Special_FadeOutPalettes ld hl, wStatusFlags set 2, [hl] ; Flash farcall ReplaceTimeOfDayPals @@ -15,7 +15,7 @@ BlindingFlash: ; 8c7e1 ld b, SCGB_MAPPALS call GetSGBLayout farcall LoadOW_BGPal7 - farcall FadeInPalettes + farcall Special_FadeInPalettes ret ; 8c80a diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index f1981c2fd..1f818b471 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 FadeOutPalettes + farcall Special_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 FadeOutPalettes + farcall Special_FadeOutPalettes xor a ld [VramState], a ld [hMapAnims], a diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm index a4ae8b7e6..2b6971ca8 100755 --- a/engine/events/happiness_egg.asm +++ b/engine/events/happiness_egg.asm @@ -1,4 +1,4 @@ -GetFirstPokemonHappiness: ; 718d +Special_GetFirstPokemonHappiness: ; 718d ld hl, PartyMon1Happiness ld bc, PARTYMON_STRUCT_LENGTH ld de, PartySpecies @@ -17,7 +17,7 @@ GetFirstPokemonHappiness: ; 718d call GetPokemonName jp CopyPokemonName_Buffer1_Buffer3 -CheckFirstMonIsEgg: ; 71ac +Special_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 493330e58..d967b1ecf 100755 --- a/engine/events/heal_machine_anim.asm +++ b/engine/events/heal_machine_anim.asm @@ -1,4 +1,4 @@ -HealMachineAnim: ; 12324 +Special_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/itemfinder.asm b/engine/events/itemfinder.asm index 71aaa5b69..19e40ea4b 100755 --- a/engine/events/itemfinder.asm +++ b/engine/events/itemfinder.asm @@ -30,7 +30,7 @@ ItemFinder: ; 12580 .Script_FoundSomething: ; 0x125ad reloadmappart - special UpdateTimePals + special Special_UpdateTimePals callasm .ItemfinderSound writetext .Text_FoundSomething closetext @@ -39,7 +39,7 @@ ItemFinder: ; 12580 .Script_FoundNothing: ; 0x125ba reloadmappart - special UpdateTimePals + special Special_UpdateTimePals writetext .Text_FoundNothing closetext end diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm index c85642ab8..b250741d0 100755 --- a/engine/events/magnet_train.asm +++ b/engine/events/magnet_train.asm @@ -442,7 +442,7 @@ MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae ld [wEnvironment], a ld b, SCGB_MAPPALS call GetSGBLayout - call UpdateTimePals + call Special_UpdateTimePals ld a, [rBGP] ld [wBGP], a ld a, [rOBP0] diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm index 97372a57a..73ed89143 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 ContestReturnMons + special Special_ContestReturnMons .finish end diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index 95fc0f1d8..3e06113ae 100644 --- a/engine/events/move_deleter.asm +++ b/engine/events/move_deleter.asm @@ -1,4 +1,4 @@ -MoveDeletion: +Special_MoveDeletion: ld hl, .IntroText call PrintText call YesNoBox diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 4583733ee..35554cef3 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -208,7 +208,7 @@ CheckMapForSomethingToCut: ; c7ce Script_CutFromMenu: ; c7fe reloadmappart - special UpdateTimePals + special Special_UpdateTimePals Script_Cut: ; 0xc802 callasm GetPartyNick @@ -318,7 +318,7 @@ UseFlash: ; c8e0 Script_UseFlash: ; 0xc8e6 reloadmappart - special UpdateTimePals + special Special_UpdateTimePals writetext UnknownText_0xc8f3 callasm BlindingFlash closetext @@ -407,7 +407,7 @@ SurfFunction: ; c909 ret SurfFromMenuScript: ; c983 - special UpdateTimePals + special Special_UpdateTimePals UsedSurfScript: ; c986 writetext UsedSurfText ; "used SURF!" @@ -620,10 +620,10 @@ FlyFunction: ; ca3b .FlyScript: ; 0xcaa3 reloadmappart callasm HideSprites - special UpdateTimePals + special Special_UpdateTimePals callasm FlyFromAnim farscall Script_AbortBugContest - special WarpToSpawnPoint + special Special_WarpToSpawnPoint callasm DelayLoadingNewSprites writecode VAR_MOVEMENT, PLAYER_NORMAL newloadmap MAPSETUP_FLY @@ -680,7 +680,7 @@ CheckMapCanWaterfall: ; cb07 Script_WaterfallFromMenu: ; 0xcb1c reloadmappart - special UpdateTimePals + special Special_UpdateTimePals Script_UsedWaterfall: ; 0xcb20 callasm GetPartyNick @@ -856,13 +856,13 @@ dig_incave .UsedEscapeRopeScript: ; 0xcc2b reloadmappart - special UpdateTimePals + special Special_UpdateTimePals writetext .Text_UsedEscapeRope jump .UsedDigOrEscapeRopeScript .UsedDigScript: ; 0xcc35 reloadmappart - special UpdateTimePals + special Special_UpdateTimePals writetext .Text_UsedDig .UsedDigOrEscapeRopeScript: ; 0xcc3c @@ -871,7 +871,7 @@ dig_incave playsound SFX_WARP_TO applymovement PLAYER, .DigOut farscall Script_AbortBugContest - special WarpToSpawnPoint + special Special_WarpToSpawnPoint writecode VAR_MOVEMENT, PLAYER_NORMAL newloadmap MAPSETUP_DOOR playsound SFX_WARP_FROM @@ -950,7 +950,7 @@ TeleportFunction: ; cc61 .TeleportScript: ; 0xccbb reloadmappart - special UpdateTimePals + special Special_UpdateTimePals writetext .Text_ReturnToLastMonCenter pause 60 reloadmappart @@ -958,7 +958,7 @@ TeleportFunction: ; cc61 playsound SFX_WARP_TO applymovement PLAYER, .TeleportFrom farscall Script_AbortBugContest - special WarpToSpawnPoint + special Special_WarpToSpawnPoint writecode VAR_MOVEMENT, PLAYER_NORMAL newloadmap MAPSETUP_TELEPORT playsound SFX_WARP_FROM @@ -1021,7 +1021,7 @@ SetStrengthFlag: ; cd12 Script_StrengthFromMenu: ; 0xcd29 reloadmappart - special UpdateTimePals + special Special_UpdateTimePals Script_UsedStrength: ; 0xcd2d callasm SetStrengthFlag @@ -1183,7 +1183,7 @@ TryWhirlpoolMenu: ; cdde Script_WhirlpoolFromMenu: ; 0xce0b reloadmappart - special UpdateTimePals + special Special_UpdateTimePals Script_UsedWhirlpool: ; 0xce0f callasm GetPartyNick @@ -1284,7 +1284,7 @@ UnknownText_0xcea2: ; 0xcea2 HeadbuttFromMenuScript: ; 0xcea7 reloadmappart - special UpdateTimePals + special Special_UpdateTimePals HeadbuttScript: ; 0xceab callasm GetPartyNick @@ -1382,7 +1382,7 @@ GetFacingObject: ; cf0d RockSmashFromMenuScript: ; 0xcf2e reloadmappart - special UpdateTimePals + special Special_UpdateTimePals RockSmashScript: ; cf32 callasm GetPartyNick @@ -1611,7 +1611,7 @@ Fishing_CheckFacingUp: ; d06c Script_FishCastRod: ; 0xd07c reloadmappart loadvar hBGMapMode, $0 - special UpdateTimePals + special Special_UpdateTimePals loademote EMOTE_ROD callasm LoadFishingGFX loademote EMOTE_SHOCK @@ -1735,7 +1735,7 @@ BikeFunction: ; d0b3 Script_GetOnBike: ; 0xd13e reloadmappart - special UpdateTimePals + special Special_UpdateTimePals writecode VAR_MOVEMENT, PLAYER_BIKE writetext GotOnTheBikeText waitbutton @@ -1755,7 +1755,7 @@ Script_GetOnBike_Register: ; 0xd14e Script_GetOffBike: ; 0xd158 reloadmappart - special UpdateTimePals + special Special_UpdateTimePals writecode VAR_MOVEMENT, PLAYER_NORMAL writetext GotOffTheBikeText waitbutton diff --git a/engine/events/poisonstep_pals.asm b/engine/events/poisonstep_pals.asm index 498ae8f18..8eb8734f6 100644 --- a/engine/events/poisonstep_pals.asm +++ b/engine/events/poisonstep_pals.asm @@ -20,7 +20,7 @@ LoadPoisonBGPals: ; cbcdd call DmgToCgbBGPals ld c, 4 call DelayFrames - farcall _UpdateTimePals + farcall _Special_UpdateTimePals ret .cgb @@ -44,5 +44,5 @@ LoadPoisonBGPals: ; cbcdd ld [hCGBPalUpdate], a ld c, 4 call DelayFrames - farcall _UpdateTimePals + farcall _Special_UpdateTimePals ret diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index 7045dc1c8..fcc35dd28 100755 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -1,4 +1,4 @@ -PokemonCenterPC: ; 1559a +Special_PokemonCenterPC: ; 1559a call PC_CheckPartyForPokemon ret c call PC_PlayBootSound @@ -216,7 +216,7 @@ Function15715: ; 15715 ld hl, KrissPCMenuData call LoadMenuDataHeader .asm_15722 - call UpdateTimePals + call Special_UpdateTimePals call DoNthMenu jr c, .asm_15731 call MenuJumptable diff --git a/engine/events/print_photo.asm b/engine/events/print_photo.asm index 06b01bbcf..54aa1892d 100755 --- a/engine/events/print_photo.asm +++ b/engine/events/print_photo.asm @@ -1,4 +1,4 @@ -PhotoStudio: ; 16dc7 +Special_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 69949940b..ae84a43a5 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 ProfOaksPCBoot ; player chose "yes"? + call Special_ProfOaksPCBoot ; player chose "yes"? .shutdown ld hl, OakPCText4 call PrintText @@ -11,7 +11,7 @@ ProfOaksPC: ; 0x265d3 call ExitMenu ret -ProfOaksPCBoot ; 0x265ee +Special_ProfOaksPCBoot ; 0x265ee ld hl, OakPCText2 call PrintText call Rate diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm index cc46eac9f..65ed83438 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 FadeOutPalettes - special FadeInPalettes - special FadeOutPalettes - special FadeInPalettes - special FadeOutPalettes - special FadeInPalettes + special Special_FadeOutPalettes + special Special_FadeInPalettes + special Special_FadeOutPalettes + special Special_FadeInPalettes + special Special_FadeOutPalettes + special Special_FadeInPalettes waitsfx writetext UnknownText_0x50845 playsound SFX_CAUGHT_MON diff --git a/engine/events/special.asm b/engine/events/special.asm index f1cd3f4e0..d2f9673c2 100755 --- a/engine/events/special.asm +++ b/engine/events/special.asm @@ -1,4 +1,4 @@ -SpecialGiveShuckle: ; 7305 +Special_GiveShuckle: ; 7305 ; Adding to the party. xor a @@ -70,7 +70,7 @@ SpecialShuckleOT: SpecialShuckleNick: db "SHUCKIE@" -SpecialReturnShuckle: ; 737e +Special_ReturnShuckle: ; 737e farcall SelectMonFromParty jr c, .refused diff --git a/engine/events/squirtbottle.asm b/engine/events/squirtbottle.asm index 1134f1bb0..4926f30c1 100755 --- a/engine/events/squirtbottle.asm +++ b/engine/events/squirtbottle.asm @@ -7,7 +7,7 @@ _Squirtbottle: ; 50730 .SquirtbottleScript: reloadmappart - special UpdateTimePals + special Special_UpdateTimePals callasm .CheckCanUseSquirtbottle iffalse .NothingHappenedScript farjump WateredWeirdTreeScript diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 297725c60..660001560 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -113,7 +113,7 @@ PokecenterNurseScript: special HealParty playmusic MUSIC_NONE writebyte 0 ; Machine is at a Pokemon Center - special HealMachineAnim + special Special_HealMachineAnim pause 30 special RestartMapMusic spriteface LAST_TALKED, DOWN @@ -123,7 +123,7 @@ PokecenterNurseScript: iftrue .no checkflag ENGINE_POKERUS ; nurse already talked about pokerus iftrue .no - special SpecialCheckPokerus + special Special_CheckPokerus iftrue .pokerus .no @@ -203,7 +203,7 @@ HomepageScript: Radio1Script: opentext writebyte MAPRADIO_POKEMON_CHANNEL - special MapRadio + special Special_MapRadio closetext end @@ -211,7 +211,7 @@ Radio2Script: ; Lucky Channel opentext writebyte MAPRADIO_LUCKY_CHANNEL - special MapRadio + special Special_MapRadio closetext end @@ -220,7 +220,7 @@ TrashCanScript: ; 0xbc1a5 PCScript: opentext - special PokemonCenterPC + special Special_PokemonCenterPC closetext end @@ -319,7 +319,7 @@ BugContestResultsScript: opentext farwritetext ContestResults_ReadyToJudgeText waitbutton - special BugContestJudging + special Special_BugContestJudging RAM2MEM $0 if_equal 1, BugContestResults_FirstPlace if_equal 2, BugContestResults_SecondPlace @@ -345,9 +345,9 @@ BugContestResults_FinishUp iffalse BugContestResults_DidNotLeaveMons farwritetext ContestResults_ReturnPartyText waitbutton - special ContestReturnMons + special Special_ContestReturnMons BugContestResults_DidNotLeaveMons - special CheckPartyFullAfterContest + special Special_CheckPartyFullAfterContest if_equal $0, BugContestResults_CleanUp if_equal $2, BugContestResults_CleanUp farwritetext ContestResults_PartyFullText @@ -620,7 +620,7 @@ InitializeEventsScript: return AskNumber1MScript: - special RandomPhoneMon + special Special_RandomPhoneMon checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -705,7 +705,7 @@ AskNumber1MScript: end AskNumber2MScript: - special RandomPhoneMon + special Special_RandomPhoneMon checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_SAILOR_HUEY, .Huey @@ -1886,7 +1886,7 @@ CoinVendor_IntroScript: ; 0xbcde0 HappinessCheckScript: faceplayer opentext - special GetFirstPokemonHappiness + special Special_GetFirstPokemonHappiness if_less_than 50, .Unhappy if_less_than 150, .KindaHappy farwritetext HappinessText3 diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm index 9b75eb9b8..e4bc2197c 100755 --- a/engine/events/sweet_scent.asm +++ b/engine/events/sweet_scent.asm @@ -8,7 +8,7 @@ SweetScentFromMenu: ; 506bc .SweetScent: ; 0x506c8 reloadmappart - special UpdateTimePals + special Special_UpdateTimePals callasm GetPartyNick writetext UnknownText_0x50726 waitbutton diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index a9d6f900e..1ad5c9c65 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 FadeOutPalettes + special 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 WarpToSpawnPoint + special Special_WarpToSpawnPoint newloadmap MAPSETUP_WARP end_all |
