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

@@ -86,7 +86,7 @@
charmap "▲", $61 ; gfx/font/up_arrow.png charmap "▲", $61 ; gfx/font/up_arrow.png
charmap "☎", $62 ; gfx/font/phone_icon.2bpp 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 "", $6e ; gfx/font/feet_inches.png
charmap "″", $6f ; gfx/font/feet_inches.png charmap "″", $6f ; gfx/font/feet_inches.png

View File

@@ -217,7 +217,7 @@ NUM_FRUIT_TREES EQU const_value +- 1
const SWARM_YANMA ; 1 const SWARM_YANMA ; 1
; Special_ActivateFishingSwarm writebyte arguments ; ActivateFishingSwarm writebyte arguments
const_def const_def
const FISHSWARM_NONE ; 0 const FISHSWARM_NONE ; 0
const FISHSWARM_QWILFISH ; 1 const FISHSWARM_QWILFISH ; 1
@@ -229,7 +229,7 @@ NUM_FRUIT_TREES EQU const_value +- 1
const GBCHECK_SGB ; 1 const GBCHECK_SGB ; 1
const GBCHECK_CGB ; 2 const GBCHECK_CGB ; 2
; Special_CheckMagikarpLength return values ; CheckMagikarpLength return values
const_def const_def
const MAGIKARPLENGTH_NOT_MAGIKARP ; 0 const MAGIKARPLENGTH_NOT_MAGIKARP ; 0
const MAGIKARPLENGTH_REFUSED ; 1 const MAGIKARPLENGTH_REFUSED ; 1
@@ -257,7 +257,7 @@ NUM_FRUIT_TREES EQU const_value +- 1
const HEALMACHINE_ELMS_LAB ; 1 const HEALMACHINE_ELMS_LAB ; 1
const HEALMACHINE_HALL_OF_FAME ; 2 const HEALMACHINE_HALL_OF_FAME ; 2
; Special_UnownPuzzle writebyte arguments ; UnownPuzzle writebyte arguments
; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/unown_puzzle.asm) ; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/unown_puzzle.asm)
const_def const_def
const UNOWNPUZZLE_KABUTO ; 0 const UNOWNPUZZLE_KABUTO ; 0
@@ -266,7 +266,7 @@ NUM_FRUIT_TREES EQU const_value +- 1
const UNOWNPUZZLE_HO_OH ; 3 const UNOWNPUZZLE_HO_OH ; 3
NUM_UNOWN_PUZZLES EQU const_value NUM_UNOWN_PUZZLES EQU const_value
; Special_DisplayUnownWords writebyte arguments ; DisplayUnownWords writebyte arguments
; UnownWalls and MenuHeaders_UnownWalls indexes (see data/unown_walls.asm) ; UnownWalls and MenuHeaders_UnownWalls indexes (see data/unown_walls.asm)
const_def const_def
const UNOWNWORDS_ESCAPE ; 0 const UNOWNWORDS_ESCAPE ; 0
@@ -274,7 +274,7 @@ NUM_UNOWN_PUZZLES EQU const_value
const UNOWNWORDS_WATER ; 2 const UNOWNWORDS_WATER ; 2
const UNOWNWORDS_HO_OH ; 3 const UNOWNWORDS_HO_OH ; 3
; Special_MoveTutor writebyte arguments ; MoveTutor writebyte arguments
const_value set 1 const_value set 1
const MOVETUTOR_FLAMETHROWER ; 1 const MOVETUTOR_FLAMETHROWER ; 1
const MOVETUTOR_THUNDERBOLT ; 2 const MOVETUTOR_THUNDERBOLT ; 2

View File

@@ -7,179 +7,179 @@ add_special: MACRO
ENDM ENDM
SpecialsPointers:: ; c029 SpecialsPointers:: ; c029
add_special Special_WarpToSpawnPoint add_special WarpToSpawnPoint
; Communications ; Communications
add_special Special_SetBitsForLinkTradeRequest add_special SetBitsForLinkTradeRequest
add_special Special_WaitForLinkedFriend add_special WaitForLinkedFriend
add_special Special_CheckLinkTimeout add_special CheckLinkTimeout
add_special Special_TryQuickSave add_special TryQuickSave
add_special Special_CheckBothSelectedSameRoom add_special CheckBothSelectedSameRoom
add_special Special_FailedLinkToPast add_special FailedLinkToPast
add_special Special_CloseLink add_special CloseLink
add_special Special_WaitForOtherPlayerToExit add_special WaitForOtherPlayerToExit
add_special Special_SetBitsForBattleRequest add_special SetBitsForBattleRequest
add_special Special_SetBitsForTimeCapsuleRequest add_special SetBitsForTimeCapsuleRequest
add_special Special_CheckTimeCapsuleCompatibility add_special CheckTimeCapsuleCompatibility
add_special Special_EnterTimeCapsule add_special EnterTimeCapsule
add_special Special_TradeCenter add_special TradeCenter
add_special Special_Colosseum add_special Colosseum
add_special Special_TimeCapsule add_special TimeCapsule
add_special Special_CableClubCheckWhichChris add_special CableClubCheckWhichChris
add_special Special_CheckMysteryGift add_special CheckMysteryGift
add_special Special_GetMysteryGiftItem add_special GetMysteryGiftItem
add_special Special_UnlockMysteryGift add_special UnlockMysteryGift
; Map Events ; Map Events
add_special Special_BugContestJudging add_special BugContestJudging
add_special Special_CheckPartyFullAfterContest add_special CheckPartyFullAfterContest
add_special Special_ContestDropOffMons add_special ContestDropOffMons
add_special Special_ContestReturnMons add_special ContestReturnMons
add_special Special_GiveParkBalls add_special GiveParkBalls
add_special Special_CheckMagikarpLength add_special CheckMagikarpLength
add_special Special_MagikarpHouseSign add_special MagikarpHouseSign
add_special HealParty ; this is both a special and a predef add_special HealParty ; this is both a special and a predef
add_special Special_PokemonCenterPC add_special PokemonCenterPC
add_special Special_PlayersHousePC add_special PlayersHousePC
add_special Special_DayCareMan add_special DayCareMan
add_special Special_DayCareLady add_special DayCareLady
add_special Special_DayCareManOutside add_special DayCareManOutside
add_special Special_MoveDeletion add_special MoveDeletion
add_special Special_BankOfMom add_special BankOfMom
add_special Special_MagnetTrain add_special MagnetTrain
add_special Special_NameRival add_special NameRival
add_special Special_SetDayOfWeek add_special SetDayOfWeek
add_special Special_OverworldTownMap add_special OverworldTownMap
add_special Special_UnownPrinter add_special UnownPrinter
add_special Special_MapRadio add_special MapRadio
add_special Special_UnownPuzzle add_special UnownPuzzle
add_special Special_SlotMachine add_special SlotMachine
add_special Special_CardFlip add_special CardFlip
add_special Special_DummyNonfunctionalGameCornerGame add_special DummyNonfunctionalGameCornerGame
add_special Special_ClearBGPalettesBufferScreen add_special ClearBGPalettesBufferScreen
add_special Special_FadeOutPalettes add_special FadeOutPalettes
add_special Special_BattleTowerFade add_special BattleTowerFade
add_special Special_FadeBlackQuickly add_special FadeBlackQuickly
add_special Special_FadeInPalettes add_special FadeInPalettes
add_special Special_FadeInQuickly add_special FadeInQuickly
add_special ReloadSpritesNoPalettes ; bank 0 add_special ReloadSpritesNoPalettes ; bank 0
add_special ClearBGPalettes ; bank 0 add_special ClearBGPalettes ; bank 0
add_special UpdateTimePals ; bank 0 add_special UpdateTimePals ; bank 0
add_special ClearTileMap ; bank 0 add_special ClearTileMap ; bank 0
add_special UpdateSprites ; bank 0 add_special UpdateSprites ; bank 0
add_special ReplaceKrisSprite ; bank 0 add_special ReplaceKrisSprite ; bank 0
add_special Special_GameCornerPrizeMonCheckDex add_special GameCornerPrizeMonCheckDex
add_special UnusedSpecial_SeenMon add_special UnusedSpecial_SeenMon
add_special WaitSFX ; bank 0 add_special WaitSFX ; bank 0
add_special PlayMapMusic ; bank 0 add_special PlayMapMusic ; bank 0
add_special RestartMapMusic ; bank 0 add_special RestartMapMusic ; bank 0
add_special Special_HealMachineAnim add_special HealMachineAnim
add_special Special_SurfStartStep add_special SurfStartStep
add_special Special_FindPartyMonGreaterThanThatLevel add_special FindPartyMonGreaterThanThatLevel
add_special Special_FindPartyMonAtLeastThatHappy add_special FindPartyMonAtLeastThatHappy
add_special Special_FindPartyMonThatSpecies add_special FindPartyMonThatSpecies
add_special Special_FindPartyMonThatSpeciesYourTrainerID add_special FindPartyMonThatSpeciesYourTrainerID
add_special UnusedSpecial_CheckUnusedTwoDayTimer add_special UnusedSpecial_CheckUnusedTwoDayTimer
add_special Special_DayCareMon1 add_special DayCareMon1
add_special Special_DayCareMon2 add_special DayCareMon2
add_special Special_SelectRandomBugContestContestants add_special SelectRandomBugContestContestants
add_special Special_ActivateFishingSwarm add_special ActivateFishingSwarm
add_special Special_ToggleMaptileDecorations add_special ToggleMaptileDecorations
add_special Special_ToggleDecorationsVisibility add_special ToggleDecorationsVisibility
add_special Special_GiveShuckle add_special GiveShuckle
add_special Special_ReturnShuckle add_special ReturnShuckle
add_special Special_BillsGrandfather add_special BillsGrandfather
add_special Special_CheckPokerus add_special CheckPokerus
add_special Special_DisplayCoinCaseBalance add_special DisplayCoinCaseBalance
add_special Special_DisplayMoneyAndCoinBalance add_special DisplayMoneyAndCoinBalance
add_special Special_PlaceMoneyTopRight add_special PlaceMoneyTopRight
add_special Special_CheckForLuckyNumberWinners add_special CheckForLuckyNumberWinners
add_special Special_CheckLuckyNumberShowFlag add_special CheckLuckyNumberShowFlag
add_special Special_ResetLuckyNumberShowFlag add_special ResetLuckyNumberShowFlag
add_special Special_PrintTodaysLuckyNumber add_special PrintTodaysLuckyNumber
add_special Special_SelectApricornForKurt add_special SelectApricornForKurt
add_special Special_NameRater add_special NameRater
add_special Special_DisplayLinkRecord add_special DisplayLinkRecord
add_special Special_GetFirstPokemonHappiness add_special GetFirstPokemonHappiness
add_special Special_CheckFirstMonIsEgg add_special CheckFirstMonIsEgg
add_special Special_RandomUnseenWildMon add_special RandomUnseenWildMon
add_special Special_RandomPhoneWildMon add_special RandomPhoneWildMon
add_special Special_RandomPhoneMon add_special RandomPhoneMon
add_special Special_LoadUsedSpritesGFX add_special LoadUsedSpritesGFX
add_special Special_PlaySlowCry add_special PlaySlowCry
add_special Special_SnorlaxAwake add_special SnorlaxAwake
add_special Special_YoungerHaircutBrother add_special YoungerHaircutBrother
add_special Special_OlderHaircutBrother add_special OlderHaircutBrother
add_special Special_DaisysGrooming add_special DaisysGrooming
add_special Special_PlayCurMonCry add_special PlayCurMonCry
add_special Special_ProfOaksPCBoot add_special ProfOaksPCBoot
add_special Special_GameboyCheck add_special GameboyCheck
add_special Special_TrainerHouse add_special TrainerHouse
add_special Special_PhotoStudio add_special PhotoStudio
add_special Special_InitRoamMons add_special InitRoamMons
add_special Special_FadeOutMusic add_special FadeOutMusic
add_special Special_Diploma add_special Diploma
add_special Special_PrintDiploma add_special PrintDiploma
; Crystal ; Crystal
add_special Special_Function11ac3e add_special Function11ac3e
add_special Special_Function11b444 add_special Function11b444
add_special Special_Function11b5e8 add_special Function11b5e8
add_special Special_Function11b7e5 add_special Function11b7e5
add_special Special_Function11b879 add_special Function11b879
add_special Special_Function11b920 add_special Function11b920
add_special Special_Function11b93b add_special Function11b93b
add_special Special_BattleTowerRoomMenu add_special BattleTowerRoomMenu
add_special Special_Function1700ba add_special Function1700ba
add_special Special_Function170114 add_special Function170114
add_special Special_BattleTowerBattle add_special BattleTowerBattle
add_special UnusedSpecial_Function1704e1 add_special UnusedSpecial_Function1704e1
add_special DummySpecial_17021d add_special DummySpecial_17021d
add_special Special_LoadOpponentTrainerAndPokemonWithOTSprite add_special LoadOpponentTrainerAndPokemonWithOTSprite
add_special Special_Function11ba38 add_special Function11ba38
add_special Special_CheckForBattleTowerRules add_special CheckForBattleTowerRules
add_special Special_GiveOddEgg add_special GiveOddEgg
add_special Reset ; bank 0 add_special Reset ; bank 0
add_special Special_Function1011f1 add_special Function1011f1
add_special Special_Function101220 add_special Function101220
add_special Special_Function101225 add_special Function101225
add_special Special_Function101231 add_special Function101231
add_special Special_MoveTutor add_special MoveTutor
add_special Special_OmanyteChamber add_special OmanyteChamber
add_special Special_Function11c1ab add_special Function11c1ab
add_special Special_BattleTowerAction add_special BattleTowerAction
add_special Special_DisplayUnownWords add_special DisplayUnownWords
add_special Special_Menu_ChallengeExplanationCancel add_special Menu_ChallengeExplanationCancel
add_special Special_Function17d2b6 add_special Function17d2b6
add_special Special_Function17d2ce add_special Function17d2ce
add_special Special_BattleTowerMobileError add_special BattleTowerMobileError
add_special Special_AskMobileOrCable add_special AskMobileOrCable
add_special Special_HoOhChamber add_special HoOhChamber
add_special Special_Function102142 add_special Function102142
add_special Special_CelebiShrineEvent add_special CelebiShrineEvent
add_special Special_CheckCaughtCelebi add_special CheckCaughtCelebi
add_special Special_PokeSeer add_special PokeSeer
add_special Special_BuenasPassword add_special BuenasPassword
add_special Special_BuenaPrize add_special BuenaPrize
add_special Special_Dratini add_special Dratini
add_special Special_SampleKenjiBreakCountdown add_special SampleKenjiBreakCountdown
add_special Special_BeastsCheck add_special BeastsCheck
add_special Special_MonCheck add_special MonCheck
add_special Special_SetPlayerPalette add_special SetPlayerPalette
add_special DummySpecial_170bd2 add_special DummySpecial_170bd2
add_special Special_Mobile_SelectThreeMons add_special Mobile_SelectThreeMons
add_special Special_Function1037eb add_special Function1037eb
add_special Special_Function10383c add_special Function10383c
add_special Special_StubbedTrainerRankings_Healings add_special StubbedTrainerRankings_Healings
add_special Special_RefreshSprites add_special RefreshSprites
add_special Special_Function1037c2 add_special Function1037c2
add_special Special_Mobile_DummyReturnFalse add_special Mobile_DummyReturnFalse
add_special Special_Function103780 add_special Function103780
add_special Special_Function10387b add_special Function10387b
add_special Special_AskRememberPassword add_special AskRememberPassword
add_special Special_LoadMapPalettes add_special LoadMapPalettes
add_special UnusedSpecial_FindItemInPCOrBag add_special UnusedSpecial_FindItemInPCOrBag
add_special Special_InitialSetDSTFlag add_special InitialSetDSTFlag
add_special Special_InitialClearDSTFlag add_special InitialClearDSTFlag
add_special DummySpecial_c224 add_special DummySpecial_c224
; c224 ; c224

View File

@@ -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) - [`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) - [`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) - [`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) - [`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`. **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): In [engine/events/bug_contest/contest_2.asm](/engine/events/bug_contest/contest_2.asm):
```asm ```asm
Special_CheckBugContestContestantFlag: ; 139ed CheckBugContestContestantFlag: ; 139ed
; Checks the flag of the Bug Catching Contestant whose index is loaded in a. ; 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. ; Bug: If a >= 10 when this is called, it will read beyond the table.

View File

@@ -887,7 +887,7 @@ Hatch_ShellFragmentLoop: ; 17418 (5:7418)
jr nz, .loop jr nz, .loop
ret ret
Special_DayCareMon1: ; 17421 DayCareMon1: ; 17421
ld hl, DayCareMon1Text ld hl, DayCareMon1Text
call PrintText call PrintText
ld a, [wBreedMon1Species] ld a, [wBreedMon1Species]
@@ -900,7 +900,7 @@ Special_DayCareMon1: ; 17421
call DayCareMonCompatibilityText call DayCareMonCompatibilityText
jp PrintText jp PrintText
Special_DayCareMon2: ; 17440 DayCareMon2: ; 17440
ld hl, DayCareMon2Text ld hl, DayCareMon2Text
call PrintText call PrintText
ld a, [wBreedMon2Species] ld a, [wBreedMon2Species]

View File

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

View File

@@ -1102,7 +1102,7 @@ DecorationDesc_TownMapPoster: ; 0x26f91
opentext opentext
writetext .TownMapText writetext .TownMapText
waitbutton waitbutton
special Special_OverworldTownMap special OverworldTownMap
closetext closetext
end end
; 0x26f9b ; 0x26f9b
@@ -1194,7 +1194,7 @@ DecorationDesc_GiantOrnament: ; 26fdd
db "@" db "@"
; 0x26feb ; 0x26feb
Special_ToggleMaptileDecorations: ; 26feb ToggleMaptileDecorations: ; 26feb
lb de, 0, 4 lb de, 0, 4
ld a, [Bed] ld a, [Bed]
call SetDecorationTile call SetDecorationTile
@@ -1248,7 +1248,7 @@ SetDecorationTile: ; 27037
ret ret
; 27043 ; 27043
Special_ToggleDecorationsVisibility: ; 27043 ToggleDecorationsVisibility: ; 27043
ld de, EVENT_PLAYERS_HOUSE_2F_CONSOLE ld de, EVENT_PLAYERS_HOUSE_2F_CONSOLE
ld hl, VariableSprites + SPRITE_CONSOLE - SPRITE_VARS ld hl, VariableSprites + SPRITE_CONSOLE - SPRITE_VARS
ld a, [Console] ld a, [Console]

View File

@@ -1,11 +1,11 @@
Special_BattleTowerRoomMenu: ; 1700b0 BattleTowerRoomMenu: ; 1700b0
; special ; special
call InitBattleTowerChallengeRAM call InitBattleTowerChallengeRAM
farcall _BattleTowerRoomMenu farcall _BattleTowerRoomMenu
ret ret
; 1700ba ; 1700ba
Special_Function1700ba: ; 1700ba Function1700ba: ; 1700ba
call InitBattleTowerChallengeRAM call InitBattleTowerChallengeRAM
farcall Function11811a farcall Function11811a
ret ret
@@ -53,7 +53,7 @@ Function1700c4: ; 1700c4
ret ret
; 170114 ; 170114
Special_Function170114: ; 170114 Function170114: ; 170114
call InitBattleTowerChallengeRAM call InitBattleTowerChallengeRAM
call .Function170121 call .Function170121
farcall Function11805f farcall Function11805f
@@ -182,7 +182,7 @@ Function170139: ; 170139
ret ret
; 170215 ; 170215
Special_BattleTowerBattle: ; 170215 BattleTowerBattle: ; 170215
xor a xor a
ld [wBattleTowerBattleEnded], a ld [wBattleTowerBattleEnded], a
call _BattleTowerBattle call _BattleTowerBattle
@@ -243,7 +243,7 @@ RunBattleTowerTrainer: ; 17024d
xor a xor a
ld [wLinkMode], a ld [wLinkMode], a
farcall Special_StubbedTrainerRankings_Healings farcall StubbedTrainerRankings_Healings
farcall HealParty farcall HealParty
call ReadBTTrainerParty call ReadBTTrainerParty
call Clears5_a89a call Clears5_a89a
@@ -900,7 +900,7 @@ UnusedSpecial_Function1704e1: ; 1704e1
db "れきだいりーダーいちらん@" db "れきだいりーダーいちらん@"
; 170687 ; 170687
Special_BattleTowerAction: ; 170687 BattleTowerAction: ; 170687
ld a, [ScriptVar] ld a, [ScriptVar]
ld e, a ld e, a
ld d, 0 ld d, 0
@@ -1603,7 +1603,7 @@ BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19
ld [ScriptVar], a ld [ScriptVar], a
ret ret
Special_LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44 LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44
farcall Function_LoadOpponentTrainerAndPokemons farcall Function_LoadOpponentTrainerAndPokemons
ld a, [rSVBK] ld a, [rSVBK]
push af push af
@@ -1654,7 +1654,7 @@ DummySpecial_170bd2: ; 170bd2
ret ret
; 170bd3 ; 170bd3
Special_CheckForBattleTowerRules: ; 170bd3 CheckForBattleTowerRules: ; 170bd3
farcall _CheckForBattleTowerRules farcall _CheckForBattleTowerRules
jr c, .asm_170bde jr c, .asm_170bde
xor a ; FALSE xor a ; FALSE

View File

@@ -1,4 +1,4 @@
Special_BuenasPassword: ; 8af6b BuenasPassword: ; 8af6b
xor a xor a
ld [wWhichIndexSet], a ld [wWhichIndexSet], a
ld hl, .MenuHeader ld hl, .MenuHeader
@@ -67,7 +67,7 @@ endr
ret ret
; 8afd4 ; 8afd4
Special_BuenaPrize: ; 8afd4 BuenaPrize: ; 8afd4
xor a xor a
ld [wMenuScrollPosition], a ld [wMenuScrollPosition], a
ld a, $1 ld a, $1

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
Special_SelectRandomBugContestContestants: ; 139a8 SelectRandomBugContestContestants: ; 139a8
; Select five random people to participate in the current contest. ; Select five random people to participate in the current contest.
; First we have to make sure that any old data is cleared away. ; First we have to make sure that any old data is cleared away.
@@ -56,7 +56,7 @@ Special_SelectRandomBugContestContestants: ; 139a8
ret ret
; 139ed ; 139ed
Special_CheckBugContestContestantFlag: ; 139ed CheckBugContestContestantFlag: ; 139ed
; Checks the flag of the Bug Catching Contestant whose index is loaded in a. ; 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. ; 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" INCLUDE "data/bug_contest_flags.asm"
Special_ContestDropOffMons: ; 13a12 ContestDropOffMons: ; 13a12
ld hl, PartyMon1HP ld hl, PartyMon1HP
ld a, [hli] ld a, [hli]
or [hl] or [hl]
@@ -101,7 +101,7 @@ Special_ContestDropOffMons: ; 13a12
ret ret
; 13a31 ; 13a31
Special_ContestReturnMons: ; 13a31 ContestReturnMons: ; 13a31
; Restore the species of the second mon. ; Restore the species of the second mon.
ld hl, PartySpecies + 1 ld hl, PartySpecies + 1
ld a, [wBugContestSecondPartySpecies] ld a, [wBugContestSecondPartySpecies]

View File

@@ -244,7 +244,7 @@ ComputeAIContestantScores: ; 138b0
ld e, 0 ld e, 0
.loop .loop
push de push de
call Special_CheckBugContestContestantFlag call CheckBugContestContestantFlag
pop de pop de
jr nz, .done jr nz, .done
ld a, e ld a, e

View File

@@ -1,6 +1,6 @@
SPECIALCELEBIEVENT_CELEBI EQU $84 SPECIALCELEBIEVENT_CELEBI EQU $84
Special_CelebiShrineEvent: ; 4989a CelebiShrineEvent: ; 4989a
call DelayFrame call DelayFrame
ld a, [VramState] ld a, [VramState]
push af push af
@@ -362,7 +362,7 @@ CelebiEvent_SetBattleType: ; 49bf3
; 49bf9 ; 49bf9
Special_CheckCaughtCelebi: ; 49bf9 CheckCaughtCelebi: ; 49bf9
ld a, [wBattleResult] ld a, [wBattleResult]
bit 6, a bit 6, a
jr z, .false jr z, .false

View File

@@ -21,7 +21,7 @@
const DAYCARETEXT_OH_FINE const DAYCARETEXT_OH_FINE
const DAYCARETEXT_COME_AGAIN const DAYCARETEXT_COME_AGAIN
Special_DayCareMan: ; 166d6 DayCareMan: ; 166d6
ld hl, wDayCareMan ld hl, wDayCareMan
bit DAYCAREMAN_HAS_MON_F, [hl] bit DAYCAREMAN_HAS_MON_F, [hl]
jr nz, .AskWithdrawMon jr nz, .AskWithdrawMon
@@ -60,7 +60,7 @@ Special_DayCareMan: ; 166d6
ret ret
; 1672a ; 1672a
Special_DayCareLady: ; 1672a DayCareLady: ; 1672a
ld hl, wDayCareLady ld hl, wDayCareLady
bit DAYCARELADY_HAS_MON_F, [hl] bit DAYCARELADY_HAS_MON_F, [hl]
jr nz, .AskWithdrawMon jr nz, .AskWithdrawMon
@@ -427,7 +427,7 @@ PrintDayCareText: ; 1689b
db "@" db "@"
; 0x16936 ; 0x16936
Special_DayCareManOutside: ; 16936 DayCareManOutside: ; 16936
ld hl, wDayCareMan ld hl, wDayCareMan
bit DAYCAREMAN_HAS_EGG_F, [hl] bit DAYCAREMAN_HAS_EGG_F, [hl]
jr nz, .AskGiveEgg 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. ; if ScriptVar is 0 or 1, change the moveset of the last Dratini in the party.
; 0: give it a special moveset with Extremespeed. ; 0: give it a special moveset with Extremespeed.
; 1: give it the normal moveset of a level 15 Dratini. ; 1: give it the normal moveset of a level 15 Dratini.

View File

@@ -7,7 +7,7 @@ PlayWhirlpoolSound: ; 8c7d4
; 8c7e1 ; 8c7e1
BlindingFlash: ; 8c7e1 BlindingFlash: ; 8c7e1
farcall Special_FadeOutPalettes farcall FadeOutPalettes
ld hl, wStatusFlags ld hl, wStatusFlags
set STATUSFLAGS_FLASH_F, [hl] set STATUSFLAGS_FLASH_F, [hl]
farcall ReplaceTimeOfDayPals farcall ReplaceTimeOfDayPals
@@ -15,7 +15,7 @@ BlindingFlash: ; 8c7e1
ld b, SCGB_MAPPALS ld b, SCGB_MAPPALS
call GetSGBLayout call GetSGBLayout
farcall LoadOW_BGPal7 farcall LoadOW_BGPal7
farcall Special_FadeInPalettes farcall FadeInPalettes
ret ret
; 8c80a ; 8c80a

View File

@@ -42,7 +42,7 @@ RedCredits:: ; 86455
ld [MusicFadeID + 1], a ld [MusicFadeID + 1], a
ld a, 10 ld a, 10
ld [MusicFade], a ld [MusicFade], a
farcall Special_FadeOutPalettes farcall FadeOutPalettes
xor a xor a
ld [VramState], a ld [VramState], a
ld [hMapAnims], a ld [hMapAnims], a
@@ -65,7 +65,7 @@ HallOfFame_FadeOutMusic: ; 8648e
ld [MusicFadeID + 1], a ld [MusicFadeID + 1], a
ld a, 10 ld a, 10
ld [MusicFade], a ld [MusicFade], a
farcall Special_FadeOutPalettes farcall FadeOutPalettes
xor a xor a
ld [VramState], a ld [VramState], a
ld [hMapAnims], a ld [hMapAnims], a

View File

@@ -1,4 +1,4 @@
Special_GetFirstPokemonHappiness: ; 718d GetFirstPokemonHappiness: ; 718d
ld hl, PartyMon1Happiness ld hl, PartyMon1Happiness
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
ld de, PartySpecies ld de, PartySpecies
@@ -17,7 +17,7 @@ Special_GetFirstPokemonHappiness: ; 718d
call GetPokemonName call GetPokemonName
jp CopyPokemonName_Buffer1_Buffer3 jp CopyPokemonName_Buffer1_Buffer3
Special_CheckFirstMonIsEgg: ; 71ac CheckFirstMonIsEgg: ; 71ac
ld a, [PartySpecies] ld a, [PartySpecies]
ld [wd265], a ld [wd265], a
cp EGG cp EGG

View File

@@ -1,4 +1,4 @@
; Special_HealMachineAnim.Jumptable indexes ; HealMachineAnim.Jumptable indexes
const_def const_def
const HEALMACHINESTATE_LOADGFX const HEALMACHINESTATE_LOADGFX
const HEALMACHINESTATE_PCLOADBALLS const HEALMACHINESTATE_PCLOADBALLS
@@ -7,7 +7,7 @@
const HEALMACHINESTATE_HOFPLAYSFX const HEALMACHINESTATE_HOFPLAYSFX
const HEALMACHINESTATE_FINISH 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. ; 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] ld a, [PartyCount]
and a and a

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