ref: b4a49351c18dcef7f4493670058ad2833206f016
parent: f1ea15bbfe8528143ace793b050891a9b1f99d03
author: xCrystal <[email protected]>
date: Tue Jan 2 12:47:58 EST 2018
Finish consistent Special function names
--- a/engine/events/buena.asm
+++ b/engine/events/buena.asm
@@ -1,4 +1,4 @@
-SpecialBuenasPassword: ; 8af6b
+Special_BuenasPassword: ; 8af6b
xor a
ld [wWhichIndexSet], a
ld hl, .MenuDataHeader
@@ -64,7 +64,7 @@
ret
; 8afd4
-SpecialBuenaPrize: ; 8afd4
+Special_BuenaPrize: ; 8afd4
xor a
ld [wMenuScrollPosition], a
ld a, $1
--- a/engine/events/buena_menu.asm
+++ b/engine/events/buena_menu.asm
@@ -1,4 +1,4 @@
-AskRememberPassword: ; 4ae12
+Special_AskRememberPassword: ; 4ae12
call .DoMenu
ld a, $0
jr c, .okay
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@@ -361,7 +361,7 @@
; 49bf9
-CheckCaughtCelebi: ; 49bf9
+Special_CheckCaughtCelebi: ; 49bf9
ld a, [wBattleResult]
bit 6, a
jr z, .false
--- a/engine/events/crystal_unown.asm
+++ b/engine/events/crystal_unown.asm
@@ -1,4 +1,4 @@
-SpecialHoOhChamber: ; 0x8addb
+Special_HoOhChamber: ; 0x8addb
ld hl, PartySpecies
ld a, [hl]
cp HO_OH ; is Ho-oh the first Pokémon in the party?
@@ -11,7 +11,7 @@
ret
; 0x8adef
-SpecialOmanyteChamber: ; 8adef
+Special_OmanyteChamber: ; 8adef
call GetSecondaryMapHeaderPointer
ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
ld b, CHECK_FLAG
--- a/engine/events/dratini.asm
+++ b/engine/events/dratini.asm
@@ -1,4 +1,4 @@
-SpecialDratini: ; 0x8b170
+Special_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.
--- a/engine/events/poke_seer.asm
+++ b/engine/events/poke_seer.asm
@@ -15,7 +15,7 @@
const SEERACTION_CANT_TELL_2
const SEERACTION_LEVEL_ONLY
-SpecialPokeSeer: ; 4f0bc
+Special_PokeSeer: ; 4f0bc
ld a, SEER_INTRO
call PrintSeerText
call JoyWaitAorB
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -107,7 +107,7 @@
farwritetext NurseTakePokemonText
pause 20
- special TrainerRankings_Healings
+ special Special_TrainerRankings_Healings
spriteface LAST_TALKED, LEFT
pause 10
special HealParty
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -79,7 +79,7 @@
dba LoadGraphics ; 0e
dba LoadTileset ; 0f
dba LoadMapTimeOfDay ; 10
- dba LoadMapPalettes ; 11
+ dba Special_LoadMapPalettes ; 11
dba LoadWildMonData ; 12
dba RefreshMapSprites ; 13
dba HandleNewMap ; 14
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -41,7 +41,7 @@
ret
; 14168
-RefreshSprites:: ; 14168
+Special_RefreshSprites:: ; 14168
call .Refresh
call Special_MapCallbackSprites_LoadUsedSpritesGFX
ret
--- a/engine/search.asm
+++ b/engine/search.asm
@@ -1,4 +1,4 @@
-SpecialBeastsCheck: ; 0x4a6e8
+Special_BeastsCheck: ; 0x4a6e8
; Check if the player owns all three legendary beasts.
; They must exist in either party or PC, and have the player's OT and ID.
; Return the result in ScriptVar.
@@ -29,7 +29,7 @@
ret
-SpecialMonCheck: ; 0x4a711
+Special_MonCheck: ; 0x4a711
; Check if the player owns any monsters of the species in ScriptVar.
; Return the result in ScriptVar.
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -126,73 +126,73 @@
add_special Special_PhotoStudio
add_special Special_InitRoamMons
add_special Special_FadeOutMusic
- add_special Diploma
- add_special PrintDiploma
+ add_special Special_Diploma
+ add_special Special_PrintDiploma
; Crystal
- add_special Function11ac3e
- add_special Function11b444
- add_special Function11b5e8
- add_special Function11b7e5
- add_special Function11b879
- add_special Function11b920
- add_special Function11b93b
- add_special BattleTowerRoomMenu
- add_special Function1700ba
- add_special Function170114
- add_special BattleTowerBattle
- add_special Function1704e1
- add_special EmptySpecial_17021d
- add_special Function_LoadOpponentTrainerAndPokemonsWithOTSprite
- add_special Function11ba38
- add_special SpecialCheckForBattleTowerRules
+ add_special Special_Function11ac3e
+ add_special Special_Function11b444
+ add_special Special_Function11b5e8
+ add_special Special_Function11b7e5
+ add_special Special_Function11b879
+ add_special Special_Function11b920
+ add_special Special_Function11b93b
+ add_special Special_BattleTowerRoomMenu
+ add_special Special_Function1700ba
+ add_special Special_Function170114
+ add_special Special_BattleTowerBattle
+ add_special Special_Function1704e1
+ add_special DummySpecial17021d
+ add_special Special_LoadOpponentTrainerAndPokemonWithOTSprite
+ add_special Special_Function11ba38
+ add_special Special_CheckForBattleTowerRules
add_special Special_GiveOddEgg
- add_special Reset
- add_special Function1011f1
- add_special Function101220
- add_special Function101225
- add_special Function101231
+ add_special Reset ; bank 0
+ add_special Special_Function1011f1
+ add_special Special_Function101220
+ add_special Special_Function101225
+ add_special Special_Function101231
add_special Special_MoveTutor
- add_special SpecialOmanyteChamber
- add_special Function11c1ab
- add_special BattleTowerAction
+ add_special Special_OmanyteChamber
+ add_special Special_Function11c1ab
+ add_special Special_BattleTowerAction
add_special Special_DisplayUnownWords
add_special Special_Menu_ChallengeExplanationCancel
- add_special Function17d2b6
- add_special Function17d2ce
- add_special BattleTowerMobileError
- add_special AskMobileOrCable
- add_special SpecialHoOhChamber
- add_special Function102142
+ add_special Special_Function17d2b6
+ add_special Special_Function17d2ce
+ add_special Special_BattleTowerMobileError
+ add_special Special_AskMobileOrCable
+ add_special Special_HoOhChamber
+ add_special Special_Function102142
add_special Special_CelebiShrineEvent
- add_special CheckCaughtCelebi
- add_special SpecialPokeSeer
- add_special SpecialBuenasPassword
- add_special SpecialBuenaPrize
- add_special SpecialDratini
+ add_special Special_CheckCaughtCelebi
+ add_special Special_PokeSeer
+ add_special Special_BuenasPassword
+ add_special Special_BuenaPrize
+ add_special Special_Dratini
add_special Special_SampleKenjiBreakCountdown
- add_special SpecialBeastsCheck
- add_special SpecialMonCheck
+ add_special Special_BeastsCheck
+ add_special Special_MonCheck
add_special Special_SetPlayerPalette
- add_special ret_170bd2
- add_special Mobile_SelectThreeMons
- add_special Function1037eb
- add_special Function10383c
- add_special TrainerRankings_Healings
- add_special RefreshSprites
- add_special Function1037c2
- add_special Mobile_DummyReturnFalse
- add_special Function103780
- add_special Function10387b
- add_special AskRememberPassword
- add_special LoadMapPalettes
- add_special FindItemInPCOrBag
+ add_special DummySpecial170bd2
+ add_special Special_Mobile_SelectThreeMons
+ add_special Special_Function1037eb
+ add_special Special_Function10383c
+ add_special Special_TrainerRankings_Healings
+ add_special Special_RefreshSprites
+ add_special Special_Function1037c2
+ add_special Special_Mobile_DummyReturnFalse
+ add_special Special_Function103780
+ add_special Special_Function10387b
+ add_special Special_AskRememberPassword
+ add_special Special_LoadMapPalettes
+ add_special UnusedSpecial_FindItemInPCOrBag
add_special Special_InitialSetDSTFlag
add_special Special_InitialClearDSTFlag
- add_special SpecialNone
+ add_special DummySpecialc224
; c224
-SpecialNone: ; c224
+DummySpecialc224: ; c224
ret
; c225
@@ -625,7 +625,7 @@
ret
; c49f
-Diploma: ; c49f
+Special_Diploma: ; c49f
call FadeToMenu
farcall _Diploma
call ExitAllMenus
@@ -632,7 +632,7 @@
ret
; c4ac
-PrintDiploma: ; c4ac
+Special_PrintDiploma: ; c4ac
call FadeToMenu
farcall _PrintDiploma
call ExitAllMenus
--- a/engine/warp_connection.asm
+++ b/engine/warp_connection.asm
@@ -298,12 +298,12 @@
ld [hMapAnims], a
xor a
ld [hTileAnimFrame], a
- farcall RefreshSprites
+ farcall Special_RefreshSprites
call LoadFontsExtra
farcall LoadOverworldFont
ret
-LoadMapPalettes: ; 1047eb
+Special_LoadMapPalettes: ; 1047eb
ld b, SCGB_MAPPALS
jp GetSGBLayout
; 1047f0
--- a/home/map.asm
+++ b/home/map.asm
@@ -2042,7 +2042,7 @@
ReloadTilesetAndPalettes:: ; 2bae
call DisableLCD
call ClearSprites
- farcall RefreshSprites
+ farcall Special_RefreshSprites
call LoadStandardFont
call LoadFontsExtra
ld a, [hROMBank]
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -16,10 +16,10 @@
.Scene0:
writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS
- special BattleTowerAction
+ special Special_BattleTowerAction
iffalse .SkipEverything
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
- special BattleTowerAction
+ special Special_BattleTowerAction
if_equal $0, .SkipEverything
if_equal $2, .priorityjump1
if_equal $3, .SkipEverything
@@ -34,9 +34,9 @@
.priorityjump1
priorityjump BattleTower_LeftWithoutSaving
writebyte BATTLETOWERACTION_CHALLENGECANCELED
- special BattleTowerAction
+ special Special_BattleTowerAction
writebyte BATTLETOWERACTION_06
- special BattleTowerAction
+ special Special_BattleTowerAction
.SkipEverything:
setscene $1
.Scene1:
@@ -55,13 +55,13 @@
ReceptionistScript_0x9e3e2:
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
- special BattleTowerAction
+ special Special_BattleTowerAction
if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
opentext
writetext Text_BattleTowerWelcomesYou
buttonsound
writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
- special BattleTowerAction
+ special Special_BattleTowerAction
if_not_equal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo
@@ -75,8 +75,8 @@
Script_ChooseChallenge: ; 0x9e40f
writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
- special BattleTowerAction
- special SpecialCheckForBattleTowerRules
+ special Special_BattleTowerAction
+ special Special_CheckForBattleTowerRules
if_not_equal $0, Script_WaitButton
writetext Text_SaveBeforeEnteringBattleRoom
yesorno
@@ -86,23 +86,23 @@
iffalse Script_Menu_ChallengeExplanationCancel
setscene $1
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
- special BattleTowerAction
- special BattleTowerRoomMenu
+ special Special_BattleTowerAction
+ special Special_BattleTowerRoomMenu
if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, Script_MobileError
writebyte BATTLETOWERACTION_11
- special BattleTowerAction
+ special Special_BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
waitbutton
closetext
writebyte BATTLETOWERACTION_CHOOSEREWARD
- special BattleTowerAction
+ special Special_BattleTowerAction
jump Script_WalkToBattleTowerElevator
Script_ResumeBattleTowerChallenge:
closetext
writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group
- special BattleTowerAction
+ special Special_BattleTowerAction
Script_WalkToBattleTowerElevator:
musicfadeout MUSIC_NONE, 8
setmapscene BATTLE_TOWER_BATTLE_ROOM, $0
@@ -111,7 +111,7 @@
follow BATTLETOWER1F_RECEPTIONIST, PLAYER
applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
writebyte BATTLETOWERACTION_0A
- special BattleTowerAction
+ special Special_BattleTowerAction
warpsound
disappear BATTLETOWER1F_RECEPTIONIST
stopfollow
@@ -121,15 +121,15 @@
Script_GivePlayerHisPrize: ; 0x9e47a
writebyte BATTLETOWERACTION_1C
- special BattleTowerAction
+ special Special_BattleTowerAction
writebyte BATTLETOWERACTION_GIVEREWARD
- special BattleTowerAction
+ special Special_BattleTowerAction
if_equal POTION, Script_YourPackIsStuffedFull
itemtotext $0, $1
giveitem ITEM_FROM_MEM, 5
writetext Text_PlayerGotFive
writebyte BATTLETOWERACTION_1D
- special BattleTowerAction
+ special Special_BattleTowerAction
closetext
end
@@ -147,7 +147,7 @@
writetext Text_BattleTowerIntroduction_2
Script_BattleTowerSkipExplanation:
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
- special BattleTowerAction
+ special Special_BattleTowerAction
jump Script_Menu_ChallengeExplanationCancel
Script_BattleTowerHopeToServeYouAgain:
@@ -157,7 +157,7 @@
end
UnreferencedScript_0x9e4b6:
- special BattleTowerMobileError
+ special Special_BattleTowerMobileError
closetext
end
@@ -173,8 +173,8 @@
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
- special BattleTowerAction
- special Function1700ba
+ special Special_BattleTowerAction
+ special Special_Function1700ba
if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, Script_MobileError
writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
@@ -187,15 +187,15 @@
UnreferencedScript_0x9e4ea:
writebyte BATTLETOWERACTION_LEVEL_CHECK
- special BattleTowerAction
+ special Special_BattleTowerAction
if_not_equal $0, Script_APkmnLevelExceeds
writebyte BATTLETOWERACTION_UBERS_CHECK
- special BattleTowerAction
+ special Special_BattleTowerAction
if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70
- special SpecialCheckForBattleTowerRules
+ special Special_CheckForBattleTowerRules
if_not_equal $0, Script_WaitButton
writebyte BATTLETOWERACTION_05
- special BattleTowerAction
+ special Special_BattleTowerAction
if_equal $0, .zero
writetext Text_CantBeRegistered_PreviousRecordDeleted
jump continue
@@ -213,9 +213,9 @@
iffalse Script_Menu_ChallengeExplanationCancel
setscene $1
writebyte BATTLETOWERACTION_06
- special BattleTowerAction
+ special Special_BattleTowerAction
writebyte BATTLETOWERACTION_12
- special BattleTowerAction
+ special Special_BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
waitbutton
jump Script_ResumeBattleTowerChallenge
@@ -236,7 +236,7 @@
jump Script_Menu_ChallengeExplanationCancel
Script_MobileError:
- special BattleTowerMobileError
+ special Special_BattleTowerMobileError
closetext
end
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -23,7 +23,7 @@
; beat all 7 opponents in a row
Script_BattleRoomLoop: ; 0x9f425
writebyte BATTLETOWERBATTLEROOM_YOUNGSTER
- special Function_LoadOpponentTrainerAndPokemonsWithOTSprite
+ special Special_LoadOpponentTrainerAndPokemonWithOTSprite
appear BATTLETOWERBATTLEROOM_YOUNGSTER
warpsound
waitsfx
@@ -32,7 +32,7 @@
battletowertext 1
buttonsound
closetext
- special BattleTowerBattle ; calls predef startbattle
+ special Special_BattleTowerBattle ; calls predef startbattle
special Special_FadeOutPalettes
reloadmap
if_not_equal $0, Script_FailedBattleTowerChallenge
@@ -49,7 +49,7 @@
closetext
playmusic MUSIC_HEAL
special Special_FadeOutPalettes
- special LoadMapPalettes
+ special Special_LoadMapPalettes
pause 60
special Special_FadeInPalettes
special RestartMapMusic
@@ -68,11 +68,11 @@
yesorno
iffalse Script_DontSaveAndEndTheSession
writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group
- special BattleTowerAction
+ special Special_BattleTowerAction
writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward
- special BattleTowerAction
+ special Special_BattleTowerAction
writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave
- special BattleTowerAction
+ special Special_BattleTowerAction
playsound SFX_SAVE
waitsfx
special Special_FadeOutPalettes
@@ -82,9 +82,9 @@
yesorno
iffalse Script_ContinueAndBattleNextOpponent
writebyte BATTLETOWERACTION_CHALLENGECANCELED
- special BattleTowerAction
+ special Special_BattleTowerAction
writebyte BATTLETOWERACTION_06
- special BattleTowerAction
+ special Special_BattleTowerAction
closetext
special Special_FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7
@@ -96,7 +96,7 @@
special Special_BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, $7, $7
writebyte BATTLETOWERACTION_CHALLENGECANCELED
- special BattleTowerAction
+ special Special_BattleTowerAction
opentext
writetext Text_ThanksForVisiting
waitbutton
@@ -114,7 +114,7 @@
UnreferencedScript_0x9f4eb:
writebyte BATTLETOWERACTION_CHALLENGECANCELED
- special BattleTowerAction
+ special Special_BattleTowerAction
opentext
writetext Text_TooMuchTimeElapsedNoRegister
waitbutton
@@ -123,9 +123,9 @@
UnreferencedScript_0x9f4f7:
writebyte BATTLETOWERACTION_CHALLENGECANCELED
- special BattleTowerAction
+ special Special_BattleTowerAction
writebyte BATTLETOWERACTION_06
- special BattleTowerAction
+ special Special_BattleTowerAction
opentext
writetext Text_ThanksForVisiting
writetext Text_WeHopeToServeYouAgain
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -22,7 +22,7 @@
applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn
applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn
writebyte BATTLETOWERACTION_0A
- special BattleTowerAction
+ special Special_BattleTowerAction
playsound SFX_ELEVATOR
earthquake 60
waitsfx
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -28,7 +28,7 @@
waitsfx
writetext UnknownText_0x71760
buttonsound
- special Diploma
+ special Special_Diploma
writetext UnknownText_0x71763
waitbutton
closetext
@@ -49,7 +49,7 @@
writetext UnknownText_0x717d8
yesorno
iffalse UnknownScript_0x716b0
- special PrintDiploma
+ special Special_PrintDiploma
closetext
end
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -30,9 +30,9 @@
writetext CeladonEusineText1
buttonsound
writebyte SUICUNE
- special SpecialMonCheck
+ special Special_MonCheck
iffalse .NoSuicune
- special SpecialBeastsCheck
+ special Special_BeastsCheck
iftrue .HoOh
writetext NoBeastsText
waitbutton
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -14,7 +14,7 @@
jumpstd pokecenternurse
SuperNerdScript_0x188212:
- special Mobile_DummyReturnFalse
+ special Special_Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer UnknownText_0x188221
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -217,7 +217,7 @@
waitsfx
givepoke DRATINI, 15
checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
- special SpecialDratini
+ special Special_Dratini
setevent EVENT_GOT_DRATINI
setevent EVENT_JUST_RECEIVED_DRATINI
writetext UnknownText_0x18d6ca
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -61,7 +61,7 @@
jumpstd pokecenternurse
EcruteakPokecenter1FPokefanMScript:
- special Mobile_DummyReturnFalse
+ special Special_Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer EcruteakPokecenter1FPokefanMText
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -308,7 +308,7 @@
end
ElmsLabHealingMachine_HealParty:
- special TrainerRankings_Healings
+ special Special_TrainerRankings_Healings
special HealParty
playmusic MUSIC_NONE
writebyte 1 ; Machine is in Elm's Lab
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -49,7 +49,7 @@
.Script:
end_if_just_battled
- special Mobile_DummyReturnFalse
+ special Special_Mobile_DummyReturnFalse
iftrue .mobile
opentext
writetext UnknownText_0x75d65
@@ -71,7 +71,7 @@
closetext
special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes
- special TrainerRankings_Healings
+ special Special_TrainerRankings_Healings
special HealParty
playmusic MUSIC_HEAL
pause 60
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -17,7 +17,7 @@
GoldenrodPokecenter1F_GSBallSceneLeft:
writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
- special BattleTowerAction
+ special Special_BattleTowerAction
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end
@@ -49,7 +49,7 @@
GoldenrodPokecenter1F_GSBallSceneRight:
writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
- special BattleTowerAction
+ special Special_BattleTowerAction
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -472,7 +472,7 @@
startbattle
reloadmapafterbattle
pause 20
- special CheckCaughtCelebi
+ special Special_CheckCaughtCelebi
iffalse .DidntCatchCelebi
appear ILEXFOREST_KURT
applymovement ILEXFOREST_KURT, MovementData_0x6ef4e
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -21,9 +21,9 @@
MapMobileBattleRoomSignpost0Script:
refreshscreen $0
- special Function1037c2
+ special Special_Function1037c2
if_equal $1, .one
- special Function1037eb
+ special Special_Function1037eb
iffalse .false
if_equal $1, .one_
if_equal $2, .two_
@@ -35,22 +35,22 @@
closetext
special Special_FadeOutPalettes
playmusic MUSIC_HEAL
- special LoadMapPalettes
+ special Special_LoadMapPalettes
pause 60
special Special_FadeInPalettes
special RestartMapMusic
refreshscreen $0
.two_
- special TrainerRankings_Healings
+ special Special_TrainerRankings_Healings
special HealParty
- special Function10383c
+ special Special_Function10383c
iftrue .false
.one
- special Function10387b
+ special Special_Function10387b
writetext MobileBattleRoom_EstablishingCommsText
waitbutton
reloadmappart
- special Function101225
+ special Special_Function101225
.false
closetext
end
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -21,11 +21,11 @@
MapMobileTradeRoomMobileSignpost0Script:
refreshscreen $0
- special Function1037c2
+ special Special_Function1037c2
writetext MobileTradeRoomMobile_EstablishingCommsText
waitbutton
reloadmappart
- special Function101231
+ special Special_Function101231
closetext
end
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -113,7 +113,7 @@
special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes
playmusic MUSIC_HEAL
- special TrainerRankings_Healings
+ special Special_TrainerRankings_Healings
special HealParty
pause 60
special Special_FadeInQuickly
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -11,7 +11,7 @@
SeerScript:
faceplayer
opentext
- special SpecialPokeSeer
+ special Special_PokeSeer
waitbutton
closetext
end
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -76,10 +76,10 @@
writetext Text_TradeReceptionistIntro
yesorno
iffalse .Cancel
- special Mobile_DummyReturnFalse ; always returns false
+ special Special_Mobile_DummyReturnFalse ; always returns false
iffalse .NoMobile
writetext Text_TradeReceptionistMobile
- special AskMobileOrCable
+ special Special_AskMobileOrCable
iffalse .Cancel
if_equal $1, .Mobile
.NoMobile:
@@ -153,7 +153,7 @@
iffalse .Mobile_DidNotSave
special Special_TryQuickSave
iffalse .Mobile_DidNotSave
- special Function1011f1
+ special Special_Function1011f1
writetext Text_PleaseComeIn2
waitbutton
closetext
@@ -178,10 +178,10 @@
writetext Text_BattleReceptionistIntro
yesorno
iffalse .Cancel
- special Mobile_DummyReturnFalse ; always returns false
+ special Special_Mobile_DummyReturnFalse ; always returns false
iffalse .NoMobile
writetext Text_BattleReceptionistMobile
- special AskMobileOrCable
+ special Special_AskMobileOrCable
iffalse .Cancel
if_equal $1, .Mobile
.NoMobile:
@@ -255,9 +255,9 @@
writetext Text_MustSaveGame
yesorno
iffalse .Mobile_DidNotSave
- special Function103780
+ special Special_Function103780
iffalse .Mobile_DidNotSave
- special Function1011f1
+ special Special_Function1011f1
writetext Text_PleaseComeIn2
waitbutton
closetext
@@ -271,7 +271,7 @@
end
.SelectThreeMons:
- special Mobile_SelectThreeMons
+ special Special_Mobile_SelectThreeMons
iffalse .Mobile_DidNotSelect
if_equal $1, .Mobile_OK
if_equal $2, .Mobile_OK
@@ -381,7 +381,7 @@
end
Script_LeftMobileTradeRoom:
- special Function101220
+ special Special_Function101220
scall Script_WalkOutOfMobileTradeRoom
setscene $0
setmapscene MOBILE_TRADE_ROOM_MOBILE, $0
@@ -401,7 +401,7 @@
end
Script_LeftMobileBattleRoom:
- special Function101220
+ special Special_Function101220
scall Script_WalkOutOfMobileBattleRoom
setscene $0
setmapscene MOBILE_BATTLE_ROOM, $0
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -117,7 +117,7 @@
if_equal 30, UnknownScript_0x5d87f
playmusic MUSIC_BUENAS_PASSWORD
writetext UnknownText_0x5de35
- special AskRememberPassword
+ special Special_AskRememberPassword
iffalse UnknownScript_0x5d81e
writetext UnknownText_0x5de84
waitbutton
@@ -134,7 +134,7 @@
closetext
spriteface RADIOTOWER2F_BUENA, DOWN
refreshscreen $0
- special SpecialBuenasPassword
+ special Special_BuenasPassword
closetext
iffalse UnknownScript_0x5d845
opentext
@@ -316,7 +316,7 @@
iffalse UnknownScript_0x5d90f
writetext UnknownText_0x5e392
buttonsound
- special SpecialBuenaPrize
+ special Special_BuenaPrize
closetext
end
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealSpeechHouse.asm
@@ -16,7 +16,7 @@
closetext
special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes
- special TrainerRankings_Healings
+ special Special_TrainerRankings_Healings
playmusic MUSIC_HEAL
special HealParty
pause 60
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -95,7 +95,7 @@
disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
special Special_MapCallbackSprites_LoadUsedSpritesGFX
- special RefreshSprites
+ special Special_RefreshSprites
end
Route36FloriaScript:
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -79,7 +79,7 @@
jumptextfaceplayer Route40Lass1Text
PokefanMScript_0x1a61c7:
- special Mobile_DummyReturnFalse
+ special Special_Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer UnknownText_0x1a646a
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -9,7 +9,7 @@
dbw MAPCALLBACK_TILES, .HiddenDoors
.CheckWall:
- special SpecialHoOhChamber
+ special Special_HoOhChamber
checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
iftrue .OpenWall
end
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -9,7 +9,7 @@
dbw MAPCALLBACK_TILES, .HiddenDoors
.CheckWall:
- special SpecialOmanyteChamber
+ special Special_OmanyteChamber
checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
iftrue .OpenWall
end
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -15,7 +15,7 @@
jumpstd pokecenternurse
TeacherScript_0x18a480:
- special Mobile_DummyReturnFalse
+ special Special_Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer UnknownText_0x18a4a3
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -167,7 +167,7 @@
waitbutton
closetext
special Special_FadeOutPalettes
- special TrainerRankings_Healings
+ special Special_TrainerRankings_Healings
playsound SFX_FULL_HEAL
special HealParty
special Special_FadeInPalettes
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -33,7 +33,7 @@
iftrue .GotRainbowWing
checkevent EVENT_BEAT_ELITE_FOUR
iffalse .FaceBeasts
- special SpecialBeastsCheck
+ special Special_BeastsCheck
iffalse .FaceBeasts
clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2
setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1
@@ -49,7 +49,7 @@
iftrue .FoughtSuicune
appear TINTOWER1F_SUICUNE
writebyte RAIKOU
- special SpecialMonCheck
+ special Special_MonCheck
iftrue .NoRaikou
appear TINTOWER1F_RAIKOU
jump .CheckEntei
@@ -58,7 +58,7 @@
disappear TINTOWER1F_RAIKOU
.CheckEntei:
writebyte ENTEI
- special SpecialMonCheck
+ special Special_MonCheck
iftrue .NoEntei
appear TINTOWER1F_ENTEI
jump .BeastsDone
@@ -87,7 +87,7 @@
applymovement PLAYER, TinTowerPlayerMovement1
pause 15
writebyte RAIKOU
- special SpecialMonCheck
+ special Special_MonCheck
iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower
applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1
spriteface PLAYER, LEFT
@@ -100,7 +100,7 @@
waitsfx
.Next1:
writebyte ENTEI
- special SpecialMonCheck
+ special Special_MonCheck
iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower
applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1
spriteface PLAYER, RIGHT
--- a/mobile/battle_tower_5c.asm
+++ b/mobile/battle_tower_5c.asm
@@ -1,4 +1,4 @@
-BattleTowerRoomMenu: ; 1700b0
+Special_BattleTowerRoomMenu: ; 1700b0
; special
call InitBattleTowerChallengeRAM
farcall _BattleTowerRoomMenu
@@ -5,7 +5,7 @@
ret
; 1700ba
-Function1700ba: ; 1700ba
+Special_Function1700ba: ; 1700ba
call InitBattleTowerChallengeRAM
farcall Function11811a
ret
@@ -53,7 +53,7 @@
ret
; 170114
-Function170114: ; 170114
+Special_Function170114: ; 170114
call InitBattleTowerChallengeRAM
call .Function170121
farcall Function11805f
@@ -182,7 +182,7 @@
ret
; 170215
-BattleTowerBattle: ; 170215
+Special_BattleTowerBattle: ; 170215
xor a
ld [wBattleTowerBattleEnded], a
call _BattleTowerBattle
@@ -189,7 +189,7 @@
ret
; 17021d
-EmptySpecial_17021d: ; 17021d
+DummySpecial17021d: ; 17021d
ret
; 17021e
@@ -243,7 +243,7 @@
xor a
ld [wLinkMode], a
- farcall TrainerRankings_Healings
+ farcall Special_TrainerRankings_Healings
farcall HealParty
call ReadBTTrainerParty
call Clears5_a89a
@@ -654,7 +654,7 @@
ret
; 1704e1
-Function1704e1: ; 1704e1
+Special_Function1704e1: ; 1704e1
; unreferenced special
call SpeechTextBox
call FadeToMenu
@@ -936,7 +936,7 @@
db "れきだいりーダーいちらん@"
; 170687
-BattleTowerAction: ; 170687
+Special_BattleTowerAction: ; 170687
ld a, [ScriptVar]
ld e, a
ld d, 0
@@ -1639,7 +1639,7 @@
ld [ScriptVar], a
ret
-Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44
+Special_LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44
farcall Function_LoadOpponentTrainerAndPokemons
ld a, [rSVBK]
push af
@@ -1752,11 +1752,11 @@
db SPRITE_OFFICER
db SPRITE_ROCKET_GIRL
-ret_170bd2: ; 170bd2
+DummySpecial170bd2: ; 170bd2
ret
; 170bd3
-SpecialCheckForBattleTowerRules: ; 170bd3
+Special_CheckForBattleTowerRules: ; 170bd3
farcall CheckForBattleTowerRules
jr c, .asm_170bde
xor a
--- a/mobile/fixed_words.asm
+++ b/mobile/fixed_words.asm
@@ -274,7 +274,7 @@
jr .copy_string
; 11c1ab
-Function11c1ab: ; 11c1ab
+Special_Function11c1ab: ; 11c1ab
ld a, [hInMenu]
push af
ld a, $1
--- a/mobile/mobile_12_2.asm
+++ b/mobile/mobile_12_2.asm
@@ -159,7 +159,7 @@
ret
; 4a927
-FindItemInPCOrBag: ; 4a927
+UnusedSpecial_FindItemInPCOrBag: ; 4a927
ld a, [ScriptVar]
ld [CurItem], a
ld hl, PCItems
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -2804,7 +2804,7 @@
ret
; 1011f1
-Function1011f1: ; 1011f1
+Special_Function1011f1: ; 1011f1
ld a, $04
call GetSRAMBank
ld a, [$a60c]
@@ -2828,13 +2828,13 @@
ret
; 101220
-Function101220: ; 101220
+Special_Function101220: ; 101220
xor a
ld [wLinkMode], a
ret
; 101225
-Function101225: ; 101225
+Special_Function101225: ; 101225
ld d, 1
ld e, BANK(Jumptable_101297)
ld bc, Jumptable_101297
@@ -2841,7 +2841,7 @@
call Function100000
jr Function10123d
-Function101231: ; 101231
+Special_Function101231: ; 101231
ld d, 2
ld e, BANK(Jumptable_101297)
ld bc, Jumptable_101297
@@ -2872,7 +2872,7 @@
call Function1021e0
call Function1020ea
ret c
- call Function102142
+ call Special_Function102142
ret
; 101265
@@ -5025,7 +5025,7 @@
ret
; 102142
-Function102142: ; 102142
+Special_Function102142: ; 102142
call Function10218d
call Function102180
ld hl, UnknownText_0x1021d1
@@ -7724,9 +7724,9 @@
dw Unknown_103608
dw Unknown_103608
dw Unknown_1035fe
- dw AskMobileOrCable
- dw AskMobileOrCable
- dw AskMobileOrCable
+ dw Special_AskMobileOrCable
+ dw Special_AskMobileOrCable
+ dw Special_AskMobileOrCable
Unknown_1035e7: ; 1035e7
dwcoord 0, 6
@@ -7757,7 +7757,7 @@
db 2, 2, 3
; 103612
-AskMobileOrCable: ; 103612
+Special_AskMobileOrCable: ; 103612
ld hl, MenuDataHeader_103640
call LoadMenuDataHeader
ld a, [wMobileOrCable_LastSelection]
@@ -7814,7 +7814,7 @@
ret
; 10366e
-Mobile_SelectThreeMons: ; 10366e
+Special_Mobile_SelectThreeMons: ; 10366e
farcall Mobile_AlwaysReturnNotCarry
bit 7, c
jr z, .asm_10369b
@@ -7983,7 +7983,7 @@
db "@"
; 0x103780
-Function103780: ; 103780
+Special_Function103780: ; 103780
ld a, [wd265]
push af
call Function10378c
@@ -8025,7 +8025,7 @@
ret
; 1037c2
-Function1037c2: ; 1037c2
+Special_Function1037c2: ; 1037c2
call Function103823
jr c, .nope
ld a, [wdc5f]
@@ -8051,7 +8051,7 @@
db "@"
; 0x1037eb
-Function1037eb: ; 1037eb
+Special_Function1037eb: ; 1037eb
call Function103823
jr nc, .asm_103807
ld hl, UnknownText_0x103819
@@ -8106,7 +8106,7 @@
ret
; 10383c
-Function10383c: ; 10383c
+Special_Function10383c: ; 10383c
ld a, $01
ld [wdc60], a
xor a
@@ -8139,7 +8139,7 @@
db "@"
; 0x10387b
-Function10387b: ; 10387b
+Special_Function10387b: ; 10387b
farcall Mobile_AlwaysReturnNotCarry
bit 7, c
ret nz
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -304,7 +304,7 @@
ld hl, sTrainerRankingFruitPicked
jp TrainerRankings_Increment3Byte
-TrainerRankings_Healings: mobile ; 1060a2
+Special_TrainerRankings_Healings: mobile ; 1060a2
ld hl, sTrainerRankingHealings
jp TrainerRankings_Increment3Byte
@@ -773,7 +773,7 @@
; functions related to the cable club and various NPC scripts referencing mobile communications
-Mobile_DummyReturnFalse: ; 10630f
+Special_Mobile_DummyReturnFalse: ; 10630f
xor a
ld [ScriptVar], a
ret
@@ -798,7 +798,7 @@
or a
ret
-Function106331: ; 106331 - called by Mobile_DummyReturnFalse in Crystal-J
+Function106331: ; 106331 - called by Special_Mobile_DummyReturnFalse in Crystal-J
; check ~[4:b000] == [7:a800]
ld a, $4
call GetSRAMBank
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -1672,7 +1672,7 @@
push af
ld a, $1
ld [rSVBK], a
- farcall Function11b93b
+ farcall Special_Function11b93b
pop af
ld [rSVBK], a
@@ -5729,7 +5729,7 @@
done
; 0x11ac3e
-Function11ac3e: ; 11ac3e
+Special_Function11ac3e: ; 11ac3e
call SpeechTextBox
call FadeToMenu
callfar ClearSpriteAnims2
@@ -7060,7 +7060,7 @@
ret
; 11b444
-Function11b444: ; 11b444
+Special_Function11b444: ; 11b444
; special
call Mobile46_InitJumptable
call Mobile46_RunJumptable
@@ -7349,7 +7349,7 @@
ret
; 11b5e8
-Function11b5e8: ; 11b5e8
+Special_Function11b5e8: ; 11b5e8
ld a, $0
call GetSRAMBank
ld hl, wRTC
@@ -7585,7 +7585,7 @@
ret
; 11b7e5
-Function11b7e5: ; 11b7e5
+Special_Function11b7e5: ; 11b7e5
ld a, [$c60d] ; species
ld [wOTTrademonSpecies], a
ld [CurPartySpecies], a
@@ -7644,7 +7644,7 @@
ret
; 11b879
-Function11b879: ; 11b879
+Special_Function11b879: ; 11b879
farcall BattleTower_CheckSaveFileExistsAndIsYours
ld a, [ScriptVar]
and a
@@ -7737,7 +7737,7 @@
ret
; 11b920
-Function11b920: ; 11b920
+Special_Function11b920: ; 11b920
call Mobile46_InitJumptable
ld a, $5
call GetSRAMBank
@@ -7750,7 +7750,7 @@
ret
; 11b93b
-Function11b93b: ; 11b93b
+Special_Function11b93b: ; 11b93b
ld a, $5
call GetSRAMBank
xor a
@@ -7894,7 +7894,7 @@
ret
; 11ba38
-Function11ba38: ; 11ba38
+Special_Function11ba38: ; 11ba38
farcall CheckCurPartyMonFainted
ret c
xor a
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -513,7 +513,7 @@
db "Cancel@"
; 17d2b6
-Function17d2b6: ; 17d2b6
+Special_Function17d2b6: ; 17d2b6
call Function17d2c0
farcall Function1181da
ret
@@ -528,7 +528,7 @@
ret
; 17d2ce
-Function17d2ce: ; 17d2ce
+Special_Function17d2ce: ; 17d2ce
ld a, $5
call GetSRAMBank
ld a, [$aa72]
@@ -4619,7 +4619,7 @@
jr .asm_17f536
; 17f53d
-BattleTowerMobileError: ; 17f53d
+Special_BattleTowerMobileError: ; 17f53d
call FadeToMenu
xor a
ld [wc303], a
--- a/mobile/mobile_menu.asm
+++ b/mobile/mobile_menu.asm
@@ -847,7 +847,7 @@
call ClearBGPalettes
ld b, SCGB_DIPLOMA
call GetSGBLayout
- farcall Function11c1ab
+ farcall Special_Function11c1ab
pop bc
call LoadFontsExtra
jp Function4a4c4