Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish consistent Special function names

Browse Source
This commit is contained in:
xCrystal
2018-01-02 17:47:58 +01:00
parent f1ea15bbfe
commit b4a49351c1
47 changed files with 207 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/events/buena.asm
View File

@@ -1,4 +1,4 @@
SpecialBuenasPassword: ; 8af6b
Special_BuenasPassword: ; 8af6b
xor a
ld [wWhichIndexSet], a
ld hl, .MenuDataHeader
@@ -64,7 +64,7 @@ SpecialBuenasPassword: ; 8af6b
ret
; 8afd4
SpecialBuenaPrize: ; 8afd4
Special_BuenaPrize: ; 8afd4
xor a
ld [wMenuScrollPosition], a
ld a, $1

2
engine/events/buena_menu.asm
View File

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

2
engine/events/celebi.asm
View File

@@ -361,7 +361,7 @@ CelebiEvent_SetBattleType: ; 49bf3
; 49bf9
CheckCaughtCelebi: ; 49bf9
Special_CheckCaughtCelebi: ; 49bf9
ld a, [wBattleResult]
bit 6, a
jr z, .false

4
engine/events/crystal_unown.asm
View File

@@ -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 @@ SpecialHoOhChamber: ; 0x8addb
ret
; 0x8adef
SpecialOmanyteChamber: ; 8adef
Special_OmanyteChamber: ; 8adef
call GetSecondaryMapHeaderPointer
ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
ld b, CHECK_FLAG

2
engine/events/dratini.asm
View File

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

2
engine/events/poke_seer.asm
View File

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

2
engine/events/std_scripts.asm
View File

@@ -107,7 +107,7 @@ PokecenterNurseScript:
farwritetext NurseTakePokemonText
pause 20
special TrainerRankings_Healings
special Special_TrainerRankings_Healings
spriteface LAST_TALKED, LEFT
pause 10
special HealParty

2
engine/map_setup.asm
View File

@@ -79,7 +79,7 @@ MapSetupCommands: ; 15440
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

2
engine/overworld.asm
View File

@@ -41,7 +41,7 @@ Function14157: ; mobile
ret
; 14168
RefreshSprites:: ; 14168
Special_RefreshSprites:: ; 14168
call .Refresh
call Special_MapCallbackSprites_LoadUsedSpritesGFX
ret

4
engine/search.asm
View File

@@ -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 @@ SpecialBeastsCheck: ; 0x4a6e8
ret
SpecialMonCheck: ; 0x4a711
Special_MonCheck: ; 0x4a711
; Check if the player owns any monsters of the species in ScriptVar.
; Return the result in ScriptVar.

112
engine/specials.asm
View File

@@ -126,73 +126,73 @@ SpecialsPointers:: ; c029
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,14 +625,14 @@ Special_FadeOutMusic: ; c48f
ret
; c49f
Diploma: ; c49f
Special_Diploma: ; c49f
call FadeToMenu
farcall _Diploma
call ExitAllMenus
ret
; c4ac
PrintDiploma: ; c4ac
Special_PrintDiploma: ; c4ac
call FadeToMenu
farcall _PrintDiploma
call ExitAllMenus

4
engine/warp_connection.asm
View File

@@ -298,12 +298,12 @@ LoadGraphics: ; 1047cf
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