Remove Special_ prefix from special routines (close #478)

This commit is contained in:
Rangi
2018-01-24 11:17:05 -05:00
parent 132fe46925
commit d719d318e8
163 changed files with 758 additions and 758 deletions

View File

@@ -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]

View File

@@ -1,4 +1,4 @@
Special_CheckPartyFullAfterContest: ; 4d9e5
CheckPartyFullAfterContest: ; 4d9e5
ld a, [wContestMon]
and a
jp z, .DidntCatchAnything

View File

@@ -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]

View File

@@ -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

View File

@@ -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

View File

@@ -1,4 +1,4 @@
Special_AskRememberPassword: ; 4ae12
AskRememberPassword: ; 4ae12
call .DoMenu
ld a, $0
jr c, .okay

View File

@@ -1,4 +1,4 @@
Special_GiveParkBalls: ; 135db
GiveParkBalls: ; 135db
xor a
ld [wContestMon], a
ld a, 20

View File

@@ -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]

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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.

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -22,7 +22,7 @@ Kurt_PrintTextHowMany: ; 8800c
db "@"
; 0x88018
Special_SelectApricornForKurt: ; 88018
SelectApricornForKurt: ; 88018
call LoadStandardMenuHeader
ld c, $1
xor a

View File

@@ -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

View File

@@ -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]

View File

@@ -1,4 +1,4 @@
Special_MagnetTrain: ; 8cc04
MagnetTrain: ; 8cc04
ld a, [ScriptVar]
and a
jr nz, .ToGoldenrod

Some files were not shown because too many files have changed in this diff Show More