pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues 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 xor a
ld [wWhichIndexSet], a ld [wWhichIndexSet], a
ld hl, .MenuDataHeader ld hl, .MenuDataHeader
@@ -64,7 +64,7 @@ SpecialBuenasPassword: ; 8af6b
ret ret
; 8afd4 ; 8afd4
SpecialBuenaPrize: ; 8afd4 Special_BuenaPrize: ; 8afd4
xor a xor a
ld [wMenuScrollPosition], a ld [wMenuScrollPosition], a
ld a, $1 ld a, $1

2
engine/events/buena_menu.asm
View File

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

2
engine/events/celebi.asm
View File

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

4
engine/events/crystal_unown.asm
View File

@@ -1,4 +1,4 @@
SpecialHoOhChamber: ; 0x8addb Special_HoOhChamber: ; 0x8addb
ld hl, PartySpecies ld hl, PartySpecies
ld a, [hl] ld a, [hl]
cp HO_OH ; is Ho-oh the first Pokémon in the party? cp HO_OH ; is Ho-oh the first Pokémon in the party?
@@ -11,7 +11,7 @@ SpecialHoOhChamber: ; 0x8addb
ret ret
; 0x8adef ; 0x8adef
SpecialOmanyteChamber: ; 8adef Special_OmanyteChamber: ; 8adef
call GetSecondaryMapHeaderPointer call GetSecondaryMapHeaderPointer
ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
ld b, CHECK_FLAG 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. ; 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.

2
engine/events/poke_seer.asm
View File

@@ -15,7 +15,7 @@
const SEERACTION_CANT_TELL_2 const SEERACTION_CANT_TELL_2
const SEERACTION_LEVEL_ONLY const SEERACTION_LEVEL_ONLY
SpecialPokeSeer: ; 4f0bc Special_PokeSeer: ; 4f0bc
ld a, SEER_INTRO ld a, SEER_INTRO
call PrintSeerText call PrintSeerText
call JoyWaitAorB call JoyWaitAorB

2
engine/events/std_scripts.asm
View File

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

2
engine/map_setup.asm
View File

@@ -79,7 +79,7 @@ MapSetupCommands: ; 15440
dba LoadGraphics ; 0e dba LoadGraphics ; 0e
dba LoadTileset ; 0f dba LoadTileset ; 0f
dba LoadMapTimeOfDay ; 10 dba LoadMapTimeOfDay ; 10
dba LoadMapPalettes ; 11 dba Special_LoadMapPalettes ; 11
dba LoadWildMonData ; 12 dba LoadWildMonData ; 12
dba RefreshMapSprites ; 13 dba RefreshMapSprites ; 13
dba HandleNewMap ; 14 dba HandleNewMap ; 14

2
engine/overworld.asm
View File

@@ -41,7 +41,7 @@ Function14157: ; mobile
ret ret
; 14168 ; 14168
RefreshSprites:: ; 14168 Special_RefreshSprites:: ; 14168
call .Refresh call .Refresh
call Special_MapCallbackSprites_LoadUsedSpritesGFX call Special_MapCallbackSprites_LoadUsedSpritesGFX
ret 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. ; 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. ; They must exist in either party or PC, and have the player's OT and ID.
; Return the result in ScriptVar. ; Return the result in ScriptVar.
@@ -29,7 +29,7 @@ SpecialBeastsCheck: ; 0x4a6e8
ret ret
SpecialMonCheck: ; 0x4a711 Special_MonCheck: ; 0x4a711
; Check if the player owns any monsters of the species in ScriptVar. ; Check if the player owns any monsters of the species in ScriptVar.
; Return the result 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_PhotoStudio
add_special Special_InitRoamMons add_special Special_InitRoamMons
add_special Special_FadeOutMusic add_special Special_FadeOutMusic
add_special Diploma add_special Special_Diploma
add_special PrintDiploma add_special Special_PrintDiploma
; Crystal ; Crystal
add_special Function11ac3e add_special Special_Function11ac3e
add_special Function11b444 add_special Special_Function11b444
add_special Function11b5e8 add_special Special_Function11b5e8
add_special Function11b7e5 add_special Special_Function11b7e5
add_special Function11b879 add_special Special_Function11b879
add_special Function11b920 add_special Special_Function11b920
add_special Function11b93b add_special Special_Function11b93b
add_special BattleTowerRoomMenu add_special Special_BattleTowerRoomMenu
add_special Function1700ba add_special Special_Function1700ba
add_special Function170114 add_special Special_Function170114
add_special BattleTowerBattle add_special Special_BattleTowerBattle
add_special Function1704e1 add_special Special_Function1704e1
add_special EmptySpecial_17021d add_special DummySpecial17021d
add_special Function_LoadOpponentTrainerAndPokemonsWithOTSprite add_special Special_LoadOpponentTrainerAndPokemonWithOTSprite
add_special Function11ba38 add_special Special_Function11ba38
add_special SpecialCheckForBattleTowerRules add_special Special_CheckForBattleTowerRules
add_special Special_GiveOddEgg add_special Special_GiveOddEgg
add_special Reset add_special Reset ; bank 0
add_special Function1011f1 add_special Special_Function1011f1
add_special Function101220 add_special Special_Function101220
add_special Function101225 add_special Special_Function101225
add_special Function101231 add_special Special_Function101231
add_special Special_MoveTutor add_special Special_MoveTutor
add_special SpecialOmanyteChamber add_special Special_OmanyteChamber
add_special Function11c1ab add_special Special_Function11c1ab
add_special BattleTowerAction add_special Special_BattleTowerAction
add_special Special_DisplayUnownWords add_special Special_DisplayUnownWords
add_special Special_Menu_ChallengeExplanationCancel add_special Special_Menu_ChallengeExplanationCancel
add_special Function17d2b6 add_special Special_Function17d2b6
add_special Function17d2ce add_special Special_Function17d2ce
add_special BattleTowerMobileError add_special Special_BattleTowerMobileError
add_special AskMobileOrCable add_special Special_AskMobileOrCable
add_special SpecialHoOhChamber add_special Special_HoOhChamber
add_special Function102142 add_special Special_Function102142
add_special Special_CelebiShrineEvent add_special Special_CelebiShrineEvent
add_special CheckCaughtCelebi add_special Special_CheckCaughtCelebi
add_special SpecialPokeSeer add_special Special_PokeSeer
add_special SpecialBuenasPassword add_special Special_BuenasPassword
add_special SpecialBuenaPrize add_special Special_BuenaPrize
add_special SpecialDratini add_special Special_Dratini
add_special Special_SampleKenjiBreakCountdown add_special Special_SampleKenjiBreakCountdown
add_special SpecialBeastsCheck add_special Special_BeastsCheck
add_special SpecialMonCheck add_special Special_MonCheck
add_special Special_SetPlayerPalette add_special Special_SetPlayerPalette
add_special ret_170bd2 add_special DummySpecial170bd2
add_special Mobile_SelectThreeMons add_special Special_Mobile_SelectThreeMons
add_special Function1037eb add_special Special_Function1037eb
add_special Function10383c add_special Special_Function10383c
add_special TrainerRankings_Healings add_special Special_TrainerRankings_Healings
add_special RefreshSprites add_special Special_RefreshSprites
add_special Function1037c2 add_special Special_Function1037c2
add_special Mobile_DummyReturnFalse add_special Special_Mobile_DummyReturnFalse
add_special Function103780 add_special Special_Function103780
add_special Function10387b add_special Special_Function10387b
add_special AskRememberPassword add_special Special_AskRememberPassword
add_special LoadMapPalettes add_special Special_LoadMapPalettes
add_special FindItemInPCOrBag add_special UnusedSpecial_FindItemInPCOrBag
add_special Special_InitialSetDSTFlag add_special Special_InitialSetDSTFlag
add_special Special_InitialClearDSTFlag add_special Special_InitialClearDSTFlag
add_special SpecialNone add_special DummySpecialc224
; c224 ; c224
SpecialNone: ; c224 DummySpecialc224: ; c224
ret ret
; c225 ; c225
@@ -625,14 +625,14 @@ Special_FadeOutMusic: ; c48f
ret ret
; c49f ; c49f
Diploma: ; c49f Special_Diploma: ; c49f
call FadeToMenu call FadeToMenu
farcall _Diploma farcall _Diploma
call ExitAllMenus call ExitAllMenus
ret ret
; c4ac ; c4ac
PrintDiploma: ; c4ac Special_PrintDiploma: ; c4ac
call FadeToMenu call FadeToMenu
farcall _PrintDiploma farcall _PrintDiploma
call ExitAllMenus call ExitAllMenus

4
engine/warp_connection.asm
View File

@@ -298,12 +298,12 @@ LoadGraphics: ; 1047cf
ld [hMapAnims], a ld [hMapAnims], a
xor a xor a
ld [hTileAnimFrame], a ld [hTileAnimFrame], a
farcall RefreshSprites farcall Special_RefreshSprites
call LoadFontsExtra call LoadFontsExtra
farcall LoadOverworldFont farcall LoadOverworldFont
ret ret
LoadMapPalettes: ; 1047eb Special_LoadMapPalettes: ; 1047eb
ld b, SCGB_MAPPALS ld b, SCGB_MAPPALS
jp GetSGBLayout jp GetSGBLayout
; 1047f0 ; 1047f0

2
home/map.asm
View File

@@ -2042,7 +2042,7 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74
ReloadTilesetAndPalettes:: ; 2bae ReloadTilesetAndPalettes:: ; 2bae
call DisableLCD call DisableLCD
call ClearSprites call ClearSprites
farcall RefreshSprites farcall Special_RefreshSprites
call LoadStandardFont call LoadStandardFont
call LoadFontsExtra call LoadFontsExtra
ld a, [hROMBank] ld a, [hROMBank]

56
maps/BattleTower1F.asm
View File

@@ -16,10 +16,10 @@ BattleTower1F_MapScriptHeader:
.Scene0: .Scene0:
writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS
special BattleTowerAction special Special_BattleTowerAction
iffalse .SkipEverything iffalse .SkipEverything
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction special Special_BattleTowerAction
if_equal $0, .SkipEverything if_equal $0, .SkipEverything
if_equal $2, .priorityjump1 if_equal $2, .priorityjump1
if_equal $3, .SkipEverything if_equal $3, .SkipEverything
@@ -34,9 +34,9 @@ BattleTower1F_MapScriptHeader:
.priorityjump1 .priorityjump1
priorityjump BattleTower_LeftWithoutSaving priorityjump BattleTower_LeftWithoutSaving
writebyte BATTLETOWERACTION_CHALLENGECANCELED writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction special Special_BattleTowerAction
writebyte BATTLETOWERACTION_06 writebyte BATTLETOWERACTION_06
special BattleTowerAction special Special_BattleTowerAction
.SkipEverything: .SkipEverything:
setscene $1 setscene $1
.Scene1: .Scene1:
@@ -55,13 +55,13 @@ UnknownScript_0x9e3e0:
ReceptionistScript_0x9e3e2: ReceptionistScript_0x9e3e2:
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction special Special_BattleTowerAction
if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
opentext opentext
writetext Text_BattleTowerWelcomesYou writetext Text_BattleTowerWelcomesYou
buttonsound buttonsound
writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags] writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction special Special_BattleTowerAction
if_not_equal $0, Script_Menu_ChallengeExplanationCancel if_not_equal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo jump Script_BattleTowerIntroductionYesNo
@@ -75,8 +75,8 @@ Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
Script_ChooseChallenge: ; 0x9e40f Script_ChooseChallenge: ; 0x9e40f
writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
special BattleTowerAction special Special_BattleTowerAction
special SpecialCheckForBattleTowerRules special Special_CheckForBattleTowerRules
if_not_equal $0, Script_WaitButton if_not_equal $0, Script_WaitButton
writetext Text_SaveBeforeEnteringBattleRoom writetext Text_SaveBeforeEnteringBattleRoom
yesorno yesorno
@@ -86,23 +86,23 @@ Script_ChooseChallenge: ; 0x9e40f
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
setscene $1 setscene $1
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction special Special_BattleTowerAction
special BattleTowerRoomMenu special Special_BattleTowerRoomMenu
if_equal $a, Script_Menu_ChallengeExplanationCancel if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, Script_MobileError if_not_equal $0, Script_MobileError
writebyte BATTLETOWERACTION_11 writebyte BATTLETOWERACTION_11
special BattleTowerAction special Special_BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom writetext Text_RightThisWayToYourBattleRoom
waitbutton waitbutton
closetext closetext
writebyte BATTLETOWERACTION_CHOOSEREWARD writebyte BATTLETOWERACTION_CHOOSEREWARD
special BattleTowerAction special Special_BattleTowerAction
jump Script_WalkToBattleTowerElevator jump Script_WalkToBattleTowerElevator
Script_ResumeBattleTowerChallenge: Script_ResumeBattleTowerChallenge:
closetext closetext
writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group
special BattleTowerAction special Special_BattleTowerAction
Script_WalkToBattleTowerElevator: Script_WalkToBattleTowerElevator:
musicfadeout MUSIC_NONE, 8 musicfadeout MUSIC_NONE, 8
setmapscene BATTLE_TOWER_BATTLE_ROOM, $0 setmapscene BATTLE_TOWER_BATTLE_ROOM, $0
@@ -111,7 +111,7 @@ Script_WalkToBattleTowerElevator:
follow BATTLETOWER1F_RECEPTIONIST, PLAYER follow BATTLETOWER1F_RECEPTIONIST, PLAYER
applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
writebyte BATTLETOWERACTION_0A writebyte BATTLETOWERACTION_0A
special BattleTowerAction special Special_BattleTowerAction
warpsound warpsound
disappear BATTLETOWER1F_RECEPTIONIST disappear BATTLETOWER1F_RECEPTIONIST
stopfollow stopfollow
@@ -121,15 +121,15 @@ Script_WalkToBattleTowerElevator:
Script_GivePlayerHisPrize: ; 0x9e47a Script_GivePlayerHisPrize: ; 0x9e47a
writebyte BATTLETOWERACTION_1C writebyte BATTLETOWERACTION_1C
special BattleTowerAction special Special_BattleTowerAction
writebyte BATTLETOWERACTION_GIVEREWARD writebyte BATTLETOWERACTION_GIVEREWARD
special BattleTowerAction special Special_BattleTowerAction
if_equal POTION, Script_YourPackIsStuffedFull if_equal POTION, Script_YourPackIsStuffedFull
itemtotext $0, $1 itemtotext $0, $1
giveitem ITEM_FROM_MEM, 5 giveitem ITEM_FROM_MEM, 5
writetext Text_PlayerGotFive writetext Text_PlayerGotFive
writebyte BATTLETOWERACTION_1D writebyte BATTLETOWERACTION_1D
special BattleTowerAction special Special_BattleTowerAction
closetext closetext
end end
@@ -147,7 +147,7 @@ Script_BattleTowerExplanation: ; 0x9e4a5
writetext Text_BattleTowerIntroduction_2 writetext Text_BattleTowerIntroduction_2
Script_BattleTowerSkipExplanation: Script_BattleTowerSkipExplanation:
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction special Special_BattleTowerAction
jump Script_Menu_ChallengeExplanationCancel jump Script_Menu_ChallengeExplanationCancel
Script_BattleTowerHopeToServeYouAgain: Script_BattleTowerHopeToServeYouAgain:
@@ -157,7 +157,7 @@ Script_BattleTowerHopeToServeYouAgain:
end end
UnreferencedScript_0x9e4b6: UnreferencedScript_0x9e4b6:
special BattleTowerMobileError special Special_BattleTowerMobileError
closetext closetext
end end
@@ -173,8 +173,8 @@ UnreferencedScript_0x9e4be:
special Special_TryQuickSave special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction special Special_BattleTowerAction
special Function1700ba special Special_Function1700ba
if_equal $a, Script_Menu_ChallengeExplanationCancel if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, Script_MobileError if_not_equal $0, Script_MobileError
writetext Text_ReceivedAListOfLeadersOnTheHonorRoll writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
@@ -187,15 +187,15 @@ UnreferencedScript_0x9e4be:
UnreferencedScript_0x9e4ea: UnreferencedScript_0x9e4ea:
writebyte BATTLETOWERACTION_LEVEL_CHECK writebyte BATTLETOWERACTION_LEVEL_CHECK
special BattleTowerAction special Special_BattleTowerAction
if_not_equal $0, Script_APkmnLevelExceeds if_not_equal $0, Script_APkmnLevelExceeds
writebyte BATTLETOWERACTION_UBERS_CHECK writebyte BATTLETOWERACTION_UBERS_CHECK
special BattleTowerAction special Special_BattleTowerAction
if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70
special SpecialCheckForBattleTowerRules special Special_CheckForBattleTowerRules
if_not_equal $0, Script_WaitButton if_not_equal $0, Script_WaitButton
writebyte BATTLETOWERACTION_05 writebyte BATTLETOWERACTION_05
special BattleTowerAction special Special_BattleTowerAction
if_equal $0, .zero if_equal $0, .zero
writetext Text_CantBeRegistered_PreviousRecordDeleted writetext Text_CantBeRegistered_PreviousRecordDeleted
jump continue jump continue
@@ -213,9 +213,9 @@ continue:
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
setscene $1 setscene $1
writebyte BATTLETOWERACTION_06 writebyte BATTLETOWERACTION_06
special BattleTowerAction special Special_BattleTowerAction
writebyte BATTLETOWERACTION_12 writebyte BATTLETOWERACTION_12
special BattleTowerAction special Special_BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom writetext Text_RightThisWayToYourBattleRoom
waitbutton waitbutton
jump Script_ResumeBattleTowerChallenge jump Script_ResumeBattleTowerChallenge
@@ -236,7 +236,7 @@ Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549
jump Script_Menu_ChallengeExplanationCancel jump Script_Menu_ChallengeExplanationCancel
Script_MobileError: Script_MobileError:
special BattleTowerMobileError special Special_BattleTowerMobileError
closetext closetext
end end

24
maps/BattleTowerBattleRoom.asm
View File

@@ -23,7 +23,7 @@ Script_BattleRoom: ; 0x9f421
; beat all 7 opponents in a row ; beat all 7 opponents in a row
Script_BattleRoomLoop: ; 0x9f425 Script_BattleRoomLoop: ; 0x9f425
writebyte BATTLETOWERBATTLEROOM_YOUNGSTER writebyte BATTLETOWERBATTLEROOM_YOUNGSTER
special Function_LoadOpponentTrainerAndPokemonsWithOTSprite special Special_LoadOpponentTrainerAndPokemonWithOTSprite
appear BATTLETOWERBATTLEROOM_YOUNGSTER appear BATTLETOWERBATTLEROOM_YOUNGSTER
warpsound warpsound
waitsfx waitsfx
@@ -32,7 +32,7 @@ Script_BattleRoomLoop: ; 0x9f425
battletowertext 1 battletowertext 1
buttonsound buttonsound
closetext closetext
special BattleTowerBattle ; calls predef startbattle special Special_BattleTowerBattle ; calls predef startbattle
special Special_FadeOutPalettes special Special_FadeOutPalettes
reloadmap reloadmap
if_not_equal $0, Script_FailedBattleTowerChallenge if_not_equal $0, Script_FailedBattleTowerChallenge
@@ -49,7 +49,7 @@ Script_BattleRoomLoop: ; 0x9f425
closetext closetext
playmusic MUSIC_HEAL playmusic MUSIC_HEAL
special Special_FadeOutPalettes special Special_FadeOutPalettes
special LoadMapPalettes special Special_LoadMapPalettes
pause 60 pause 60
special Special_FadeInPalettes special Special_FadeInPalettes
special RestartMapMusic special RestartMapMusic
@@ -68,11 +68,11 @@ Script_DontBattleNextOpponent: ; 0x9f483
yesorno yesorno
iffalse Script_DontSaveAndEndTheSession iffalse Script_DontSaveAndEndTheSession
writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group
special BattleTowerAction special Special_BattleTowerAction
writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward
special BattleTowerAction special Special_BattleTowerAction
writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave
special BattleTowerAction special Special_BattleTowerAction
playsound SFX_SAVE playsound SFX_SAVE
waitsfx waitsfx
special Special_FadeOutPalettes special Special_FadeOutPalettes
@@ -82,9 +82,9 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3
yesorno yesorno
iffalse Script_ContinueAndBattleNextOpponent iffalse Script_ContinueAndBattleNextOpponent
writebyte BATTLETOWERACTION_CHALLENGECANCELED writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction special Special_BattleTowerAction
writebyte BATTLETOWERACTION_06 writebyte BATTLETOWERACTION_06
special BattleTowerAction special Special_BattleTowerAction
closetext closetext
special Special_FadeOutPalettes special Special_FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7 warpfacing UP, BATTLE_TOWER_1F, $7, $7
@@ -96,7 +96,7 @@ Script_FailedBattleTowerChallenge:
special Special_BattleTowerFade special Special_BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, $7, $7 warpfacing UP, BATTLE_TOWER_1F, $7, $7
writebyte BATTLETOWERACTION_CHALLENGECANCELED writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction special Special_BattleTowerAction
opentext opentext
writetext Text_ThanksForVisiting writetext Text_ThanksForVisiting
waitbutton waitbutton
@@ -114,7 +114,7 @@ Script_BeatenAllTrainers2:
UnreferencedScript_0x9f4eb: UnreferencedScript_0x9f4eb:
writebyte BATTLETOWERACTION_CHALLENGECANCELED writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction special Special_BattleTowerAction
opentext opentext
writetext Text_TooMuchTimeElapsedNoRegister writetext Text_TooMuchTimeElapsedNoRegister
waitbutton waitbutton
@@ -123,9 +123,9 @@ UnreferencedScript_0x9f4eb:
UnreferencedScript_0x9f4f7: UnreferencedScript_0x9f4f7:
writebyte BATTLETOWERACTION_CHALLENGECANCELED writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction special Special_BattleTowerAction
writebyte BATTLETOWERACTION_06 writebyte BATTLETOWERACTION_06
special BattleTowerAction special Special_BattleTowerAction
opentext opentext
writetext Text_ThanksForVisiting writetext Text_ThanksForVisiting
writetext Text_WeHopeToServeYouAgain writetext Text_WeHopeToServeYouAgain

2
maps/BattleTowerElevator.asm
View File

@@ -22,7 +22,7 @@ BattleTowerElevator_MapScriptHeader:
applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn
applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn
writebyte BATTLETOWERACTION_0A writebyte BATTLETOWERACTION_0A
special BattleTowerAction special Special_BattleTowerAction
playsound SFX_ELEVATOR playsound SFX_ELEVATOR
earthquake 60 earthquake 60
waitsfx waitsfx

4
maps/CeladonMansion3F.asm
View File

@@ -28,7 +28,7 @@ UnknownScript_0x7167e:
waitsfx waitsfx
writetext UnknownText_0x71760 writetext UnknownText_0x71760
buttonsound buttonsound
special Diploma special Special_Diploma
writetext UnknownText_0x71763 writetext UnknownText_0x71763
waitbutton waitbutton
closetext closetext
@@ -49,7 +49,7 @@ UnknownScript_0x716a4:
writetext UnknownText_0x717d8 writetext UnknownText_0x717d8
yesorno yesorno
iffalse UnknownScript_0x716b0 iffalse UnknownScript_0x716b0
special PrintDiploma special Special_PrintDiploma
closetext closetext
end end

4
maps/CeladonPokecenter1F.asm
View File

@@ -30,9 +30,9 @@ CeladonEusine:
writetext CeladonEusineText1 writetext CeladonEusineText1
buttonsound buttonsound
writebyte SUICUNE writebyte SUICUNE
special SpecialMonCheck special Special_MonCheck
iffalse .NoSuicune iffalse .NoSuicune
special SpecialBeastsCheck special Special_BeastsCheck
iftrue .HoOh iftrue .HoOh
writetext NoBeastsText writetext NoBeastsText
waitbutton waitbutton

2
maps/CeruleanPokecenter1F.asm
View File

@@ -14,7 +14,7 @@ NurseScript_0x18820f:
jumpstd pokecenternurse jumpstd pokecenternurse
SuperNerdScript_0x188212: SuperNerdScript_0x188212:
special Mobile_DummyReturnFalse special Special_Mobile_DummyReturnFalse
iftrue .mobile iftrue .mobile
jumptextfaceplayer UnknownText_0x188221 jumptextfaceplayer UnknownText_0x188221

2
maps/DragonShrine.asm
View File

@@ -217,7 +217,7 @@ ElderScript_0x18d1a5:
waitsfx waitsfx
givepoke DRATINI, 15 givepoke DRATINI, 15
checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
special SpecialDratini special Special_Dratini
setevent EVENT_GOT_DRATINI setevent EVENT_GOT_DRATINI
setevent EVENT_JUST_RECEIVED_DRATINI setevent EVENT_JUST_RECEIVED_DRATINI
writetext UnknownText_0x18d6ca writetext UnknownText_0x18d6ca

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