diff options
Diffstat (limited to 'engine/specials.asm')
| -rw-r--r-- | engine/specials.asm | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/engine/specials.asm b/engine/specials.asm index 965e3d58b..dc4ce32c4 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 + farcall _SetPlayerPalette ret ; c230 -Special_GameCornerPrizeMonCheckDex: ; c230 +GameCornerPrizeMonCheckDex: ; c230 ld a, [ScriptVar] dec a call CheckCaughtMon @@ -43,38 +43,38 @@ Special_GameCornerPrizeMonCheckDex: ; c230 ret ; c252 -UnusedSpecial_SeenMon: ; c252 +UnusedSetSeenMon: ; c252 ld a, [ScriptVar] dec a call SetSeenMon ret ; c25a -Special_FindGreaterThanThatLevel: ; c25a +FindPartyMonGreaterThanThatLevel: ; c25a ld a, [ScriptVar] ld b, a - farcall _FindGreaterThanThatLevel + farcall _FindPartyMonGreaterThanThatLevel jr z, FoundNone jr FoundOne -Special_FindAtLeastThatHappy: ; c268 +FindPartyMonAtLeastThatHappy: ; c268 ld a, [ScriptVar] ld b, a - farcall _FindAtLeastThatHappy + farcall _FindPartyMonAtLeastThatHappy jr z, FoundNone jr FoundOne -Special_FindThatSpecies: ; c276 +FindPartyMonThatSpecies: ; c276 ld a, [ScriptVar] ld b, a - farcall _FindThatSpecies + farcall _FindPartyMonThatSpecies jr z, FoundNone jr FoundOne -Special_FindThatSpeciesYourTrainerID: ; c284 +FindPartyMonThatSpeciesYourTrainerID: ; c284 ld a, [ScriptVar] ld b, a - farcall _FindThatSpeciesYourTrainerID + farcall _FindPartyMonThatSpeciesYourTrainerID jr z, FoundNone jr FoundOne @@ -89,7 +89,7 @@ FoundNone: ; c298 ret ; c29d -Special_NameRival: ; 0xc29d +NameRival: ; 0xc29d ld b, $2 ; rival ld de, RivalName farcall _NamingScreen @@ -103,42 +103,42 @@ Special_NameRival: ; 0xc29d DefaultRivalName: ; 0xc2b2 db "SILVER@" -Special_NameRater: ; c2b9 - farcall NameRater +NameRater: ; c2b9 + farcall _NameRater ret ; c2c0 -Special_TownMap: ; c2c0 +OverworldTownMap: ; c2c0 call FadeToMenu farcall _TownMap call ExitAllMenus ret ; c2cd -Special_UnownPrinter: ; c2cd +UnownPrinter: ; c2cd call FadeToMenu - farcall UnownPrinter + farcall _UnownPrinter call ExitAllMenus ret ; c2da -Special_DisplayLinkRecord: ; c2da +DisplayLinkRecord: ; c2da call FadeToMenu - farcall DisplayLinkRecord + farcall _DisplayLinkRecord call ExitAllMenus ret ; c2e7 -Special_KrissHousePC: ; c2e7 +PlayersHousePC: ; c2e7 xor a ld [ScriptVar], a - farcall _KrissHousePC + farcall _PlayersHousePC ld a, c ld [ScriptVar], a 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,57 +187,57 @@ 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 + farcall _UnownPuzzle ld a, [wSolvedUnownPuzzle] ld [ScriptVar], a call ExitAllMenus 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 @@ -307,14 +307,14 @@ ScriptReturnCarry: ; c3e2 ret ; c3ef -UnusedSpecial_CheckUnusedTwoDayTimer: ; c3ef +UnusedCheckUnusedTwoDayTimer: ; c3ef farcall CheckUnusedTwoDayTimer ld a, [wUnusedTwoDayTimer] ld [ScriptVar], a ret ; c3fc -Special_ActivateFishingSwarm: ; c3fc +ActivateFishingSwarm: ; c3fc ld a, [ScriptVar] ld [wFishingSwarmFlag], a ret @@ -341,26 +341,26 @@ StoreSwarmMapIndices:: ; c403 ; c419 -Special_CheckPokerus: ; c419 +CheckPokerus: ; c419 ; Check if a monster in your party has Pokerus - farcall CheckPokerus + farcall _CheckPokerus jp ScriptReturnCarry ; c422 -Special_ResetLuckyNumberShowFlag: ; c422 +ResetLuckyNumberShowFlag: ; c422 farcall RestartLuckyNumberCountdown ld hl, wLuckyNumberShowFlag - res 0, [hl] + res LUCKYNUMBERSHOW_GAME_OVER_F, [hl] farcall LoadOrRegenerateLuckyIDNumber ret ; c434 -Special_CheckLuckyNumberShowFlag: ; c434 - farcall CheckLuckyNumberShowFlag +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] |