dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine special prefixes, drop more

Browse Source
This commit is contained in:
GriffinR
2020-03-04 10:42:16 -05:00
parent ce3e1b8af0
commit 13e06bf7f8
23 changed files with 98 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeruleanCity_House1/scripts.inc
+2 -2
View File
@@ -8,7 +8,7 @@ CeruleanCity_House1_EventScript_BadgeGuy:: @ 816A7F0
message CeruleanCity_House1_Text_DescribeWhichBadge
waitmessage
setvar VAR_0x8004, LISTMENU_BADGES
special Special_ListMenu
special ListMenu
waitstate
switch VAR_RESULT
case 0, CeruleanCity_House1_EventScript_DescribeBoulderBadge
@@ -26,7 +26,7 @@ CeruleanCity_House1_EventScript_BadgeGuy:: @ 816A7F0
CeruleanCity_House1_EventScript_DescribeAnotherBadge:: @ 816A87D
message CeruleanCity_House1_Text_DescribeWhichBadge
waitmessage
special Special_ReturnToListMenu
special ReturnToListMenu
waitstate
switch VAR_RESULT
case 0, CeruleanCity_House1_EventScript_DescribeBoulderBadge
data/maps/CeruleanCity_House4/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState
specialvar VAR_0x8004, GetMENewsJisanItemAndState
copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8004, 0
goto_if_eq CeruleanCity_House4_EventScript_NoNews
data/maps/CeruleanCity_House5/scripts.inc
+3 -3
View File
@@ -38,7 +38,7 @@ CeruleanCity_House5_EventScript_ChooseExchangeItem:: @ 816AEC8
message CeruleanCity_House5_Text_ExchangeWithWhat
waitmessage
setvar VAR_0x8004, LISTMENU_BERRY_POWDER
special Special_ListMenu
special ListMenu
waitstate
switch VAR_RESULT
case 0, CeruleanCity_House5_EventScript_EnergyPowder
@@ -144,14 +144,14 @@ CeruleanCity_House5_EventScript_ExchangePowderForItem:: @ 816B055
compare VAR_RESULT, NO
goto_if_eq CeruleanCity_House5_EventScript_ChooseExchangeItem
copyvar VAR_0x8004, VAR_0x8009
specialvar VAR_RESULT, Special_HasEnoughBerryPowder
specialvar VAR_RESULT, Script_HasEnoughBerryPowder
compare VAR_RESULT, FALSE
goto_if_eq CeruleanCity_House5_EventScript_NotEnoughBerryPowder
giveitem VAR_0x8008
compare VAR_RESULT, FALSE
goto_if_eq CeruleanCity_House5_EventScript_BagIsFull
copyvar VAR_0x8004, VAR_0x8009
special Special_TakeBerryPowder
special Script_TakeBerryPowder
special PrintPlayerBerryPowderAmount
msgbox CeruleanCity_House1_Text_TradeMoreBerryPowder, MSGBOX_YESNO
compare VAR_RESULT, YES
data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4
goto_if_questlog EventScript_ReleaseEnd
lockall
setvar VAR_0x8004, 32
special Special_SetSomeVariable
special HelpSystem_SetSomeVariable
setvar VAR_0x8004, 1
special AnimatePcTurnOn
playse SE_PC_ON
data/maps/PokemonLeague_LancesRoom/scripts.inc
+1 -1
View File
@@ -137,7 +137,7 @@ PokemonLeague_LancesRoom_EventScript_PostBattle:: @ 8162AA1
PokemonLeague_LancesRoom_EventScript_DefeatedLance:: @ 8162AAB
setvar VAR_0x8004, 0
special Special_TryGainNewFanFromCounter
special Script_TryGainNewFanFromCounter
setflag FLAG_DEFEATED_LANCE
call PokemonLeague_EventScript_OpenDoorLance
msgbox PokemonLeague_LancesRoom_Text_PostBattle
data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
+41 -41
View File
@@ -82,37 +82,37 @@ SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144
end
SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 816F15B
special Special_TryLoseFansFromPlayTime
special Script_TryLoseFansFromPlayTime
setvar VAR_0x8004, FANCLUB_MEMBER1
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable
setvar VAR_0x8004, FANCLUB_MEMBER2
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable
setvar VAR_0x8004, FANCLUB_MEMBER3
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable
setvar VAR_0x8004, FANCLUB_MEMBER4
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable
setvar VAR_0x8004, FANCLUB_MEMBER5
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable
setvar VAR_0x8004, FANCLUB_MEMBER6
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable
setvar VAR_0x8004, FANCLUB_MEMBER7
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable
setvar VAR_0x8004, FANCLUB_MEMBER8
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable
end
@@ -169,13 +169,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER1
special Special_BufferFanClubTrainerName
special Script_BufferFanClubTrainerName
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore
@@ -183,7 +183,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281
end
SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: @ 816F2C0
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou
@@ -209,13 +209,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER4
special Special_BufferFanClubTrainerName
special Script_BufferFanClubTrainerName
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina
@@ -223,7 +223,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8
end
SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 816F337
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay
@@ -249,13 +249,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER2
special Special_BufferFanClubTrainerName
special Script_BufferFanClubTrainerName
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero
@@ -263,7 +263,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F
end
SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan:: @ 816F3AE
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts
@@ -289,13 +289,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER3
special Special_BufferFanClubTrainerName
special Script_BufferFanClubTrainerName
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre
@@ -303,7 +303,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6
end
SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan:: @ 816F425
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle
@@ -329,11 +329,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER6
special Special_BufferFanClubTrainerName
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
special Script_BufferFanClubTrainerName
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire
@@ -341,7 +341,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D
end
SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 816F491
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle
@@ -362,11 +362,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER5
special Special_BufferFanClubTrainerName
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
special Script_BufferFanClubTrainerName
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks
@@ -374,7 +374,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF
end
SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan:: @ 816F4F3
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool
@@ -395,11 +395,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER7
special Special_BufferFanClubTrainerName
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
special Script_BufferFanClubTrainerName
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity
@@ -407,7 +407,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521
end
SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan:: @ 816F555
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing
@@ -428,11 +428,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER8
special Special_BufferFanClubTrainerName
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
special Script_BufferFanClubTrainerName
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect
@@ -440,7 +440,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583
end
SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan:: @ 816F5B7
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational
data/maps/SilphCo_Elevator/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ SilphCo_Elevator_EventScript_FloorSelect:: @ 8161F6F
waitmessage
setvar VAR_0x8004, LISTMENU_SILPHCO_FLOORS
specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos
special Special_ListMenu
special ListMenu
waitstate
switch VAR_RESULT
case 0, SilphCo_Elevator_EventScript_To11F
data/mystery_event_msg.s
+3 -3
View File
@@ -17,9 +17,9 @@
MysteryEventScript_StampCard:: @ 8488E28
setvaddress MysteryEventScript_StampCard
setorcopyvar VAR_RESULT, 1
specialvar VAR_0x8008, Special_BattleCardAction
specialvar VAR_0x8008, BattleCardAction
setorcopyvar VAR_RESULT, 0
specialvar VAR_0x8009, Special_BattleCardAction
specialvar VAR_0x8009, BattleCardAction
subvar VAR_0x8008, VAR_0x8009
getnumberstring 0, VAR_0x8008
lock
@@ -169,7 +169,7 @@ MysteryEventScript_BattleCard:: @ 84892B9
setvaddress MysteryEventScript_BattleCard
vgoto_if_set FLAG_MYSTERY_EVENT_DONE, MysteryEventScript_BattleCardInfo
setorcopyvar VAR_RESULT, 2
specialvar VAR_0x8008, Special_BattleCardAction
specialvar VAR_0x8008, BattleCardAction
compare VAR_0x8008, 3
vgoto_if_ne MysteryEventScript_BattleCardInfo
lock
data/scripts/pc.inc
+4 -4
View File
@@ -3,7 +3,7 @@ EventScript_PC:: @ 81A6955
lockall
goto_if_set FLAG_SYS_PC_STORAGE_DISABLED, EventScript_PCDisabled
setvar VAR_0x8004, 27
special Special_SetSomeVariable
special HelpSystem_SetSomeVariable
setvar VAR_0x8004, 0
special AnimatePcTurnOn
playse SE_PC_ON
@@ -20,7 +20,7 @@ EventScript_PCDisabled:: @ 81A698E
EventScript_PCMainMenu:: @ 81A6998
message Text_AccessWhichPC
waitmessage
special ScrSpecial_CreatePCMenu
special CreatePCMenu
waitstate
goto EventScript_ChoosePCMenu
end
@@ -51,7 +51,7 @@ EventScript_AccessPokemonStorage:: @ 81A6A05
special ShowPokemonStorageSystem
waitstate
setvar VAR_0x8004, 27
special Special_SetSomeVariable
special HelpSystem_SetSomeVariable
goto EventScript_PCMainMenu
end
@@ -76,7 +76,7 @@ EventScript_AccessHallOfFame:: @ 81A6A56
playse SE_PC_LOGIN
setvar VAR_0x8004, 31
special HelpSystem_BackupSomeVariable
special Special_SetSomeVariable
special HelpSystem_SetSomeVariable
special HallOfFamePCBeginFade
waitstate
special HelpSystem_RestoreSomeVariable
data/scripts/pokedex_rating.inc
+1 -1
View File
@@ -37,7 +37,7 @@ PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC
PokedexRating_EventScript_Rate:: @ 81A73E0
setvar VAR_0x8004, 31
special HelpSystem_BackupSomeVariable
special Special_SetSomeVariable
special HelpSystem_SetSomeVariable
setvar VAR_0x8004, 0
specialvar VAR_RESULT, GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
data/scripts/trainer_battle.inc
+2 -2
View File
@@ -10,7 +10,7 @@ EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1
faceplayer
applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0
specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
specialvar VAR_RESULT, Script_HasTrainerBeenFought
compare VAR_RESULT, FALSE
goto_if_ne EventScript_NoTrainerBattle
special PlayTrainerEncounterMusic
@@ -24,7 +24,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
lock
faceplayer
call EventScript_RevealTrainer
specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
specialvar VAR_RESULT, Script_HasTrainerBeenFought
compare VAR_RESULT, FALSE
goto_if_ne EventScript_NoDoubleTrainerBattle
special HasEnoughMonsForDoubleBattle
data/specials.inc
+18 -18
View File
@@ -62,7 +62,7 @@ gSpecials:: @ 815FD60
def_special GetTrainerBattleMode
def_special ShowTrainerIntroSpeech
def_special ShowTrainerCantBattleSpeech
def_special ScrSpecial_HasTrainerBeenFought
def_special Script_HasTrainerBeenFought
def_special EndTrainerApproach
def_special PlayTrainerEncounterMusic
def_special ShouldTryRematchBattle
@@ -171,14 +171,14 @@ gSpecials:: @ 815FD60
def_special NullFieldSpecial @ Berry Blender/Roulette specials
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special Special_IsFanClubMemberFanOfPlayer
def_special Special_GetNumFansOfPlayerInTrainerFanClub
def_special Special_BufferFanClubTrainerName
def_special Special_TryLoseFansFromPlayTimeAfterLinkBattle
def_special Special_TryLoseFansFromPlayTime
def_special Special_SetPlayerGotFirstFans
def_special Special_UpdateTrainerFanClubGameClear
def_special Special_TryGainNewFanFromCounter
def_special Script_IsFanClubMemberFanOfPlayer
def_special Script_GetNumFansOfPlayerInTrainerFanClub
def_special Script_BufferFanClubTrainerName
def_special Script_TryLoseFansFromPlayTimeAfterLinkBattle
def_special Script_TryLoseFansFromPlayTime
def_special Script_SetPlayerGotFirstFans
def_special Script_UpdateTrainerFanClubGameClear
def_special Script_TryGainNewFanFromCounter
def_special RockSmashWildEncounter
def_special NullFieldSpecial @ Gabby and Ty specials
def_special NullFieldSpecial
@@ -239,7 +239,7 @@ gSpecials:: @ 815FD60
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special GetLeadMonFriendship
def_special ScrSpecial_BattleTowerMapScript2
def_special BattleTowerMapScript2
def_special ChooseNextBattleTowerTrainer
def_special CheckPartyBattleTowerBanlist
def_special PrintBattleTowerTrainerGreeting
@@ -270,7 +270,7 @@ gSpecials:: @ 815FD60
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special ScrSpecial_CreatePCMenu
def_special CreatePCMenu
def_special HallOfFamePCBeginFade
def_special ShowDiploma
def_special NullFieldSpecial @ Check lead mon Contest strength specials
@@ -352,8 +352,8 @@ gSpecials:: @ 815FD60
def_special sub_810B82C
def_special StartMarowakBattle
def_special ForcePlayerOntoBike
def_special Special_ListMenu
def_special Special_ReturnToListMenu
def_special ListMenu
def_special ReturnToListMenu
def_special sub_80CADC4
def_special SetVermilionTrashCans
def_special sub_805D1A8
@@ -389,7 +389,7 @@ gSpecials:: @ 815FD60
def_special TakePokemonFromRoute5Daycare
def_special DoSeagallopFerryScene
def_special DoesPlayerPartyContainSpecies
def_special Special_SetSomeVariable
def_special HelpSystem_SetSomeVariable
def_special HelpSystem_BackupSomeVariable
def_special HelpSystem_RestoreSomeVariable
def_special ValidateReceivedWonderCard
@@ -398,10 +398,10 @@ gSpecials:: @ 815FD60
def_special BufferUnionRoomPlayerName
def_special sub_811390C
def_special GetMartClerkObjectId
def_special Special_BattleCardAction
def_special BattleCardAction
def_special GetQuestLogState
def_special sub_8112364
def_special Special_GetMENewsJisanItemAndState
def_special GetMENewsJisanItemAndState
def_special GetPCBoxToSendMon
def_special OpenMuseumFossilPic
def_special CloseMuseumFossilPic
@@ -422,8 +422,8 @@ gSpecials:: @ 815FD60
def_special CheckHasAtLeastOneBerry
def_special DisplayBerryPowderVendorMenu
def_special RemoveBerryPowderVendorMenu
def_special Special_HasEnoughBerryPowder
def_special Special_TakeBerryPowder
def_special Script_HasEnoughBerryPowder
def_special Script_TakeBerryPowder
def_special PrintPlayerBerryPowderAmount
def_special DoPokemonLeagueLightingEffect
def_special ShowBerryCrushRankings
include/script_menu.h
+1 -1
View File
@@ -10,7 +10,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 va
bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
bool8 ScrSpecial_CreatePCMenu(void);
bool8 CreatePCMenu(void);
void ScriptMenu_DisplayPCStartupPrompt(void);
bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
include/seagallop.h
-8
View File
@@ -1,8 +0,0 @@
#ifndef GUARD_SEAGALLOP_H
#define GUARD_SEAGALLOP_H
#include "constants/seagallop.h"
void ScrSpecial_SeagallopFerry(void);
#endif //GUARD_SEAGALLOP_H
src/battle_setup.c
+1 -1
View File
@@ -848,7 +848,7 @@ u16 GetRivalBattleFlags(void)
return sRivalBattleFlags;
}
u16 ScrSpecial_HasTrainerBeenFought(void)
u16 Script_HasTrainerBeenFought(void)
{
return FlagGet(GetTrainerAFlag());
}
src/battle_tower.c
+1 -1
View File
@@ -177,7 +177,7 @@ static const u16 sLongStreakPrizes[] = {
ITEM_CHOICE_BAND
};
void ScrSpecial_BattleTowerMapScript2(void)
void BattleTowerMapScript2(void)
{
u8 count = 0;
s32 levelType;
src/berry_powder.c
+2 -2
View File
@@ -36,7 +36,7 @@ static bool8 HasEnoughBerryPowder(u32 cost)
return TRUE;
}
bool8 Special_HasEnoughBerryPowder(void)
bool8 Script_HasEnoughBerryPowder(void)
{
if (DecryptBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount) < gSpecialVar_0x8004)
return FALSE;
@@ -73,7 +73,7 @@ static bool8 TakeBerryPowder(u32 cost)
}
}
bool8 Special_TakeBerryPowder(void)
bool8 Script_TakeBerryPowder(void)
{
u32 *powder = &gSaveBlock2Ptr->berryCrush.berryPowderAmount;
if (!HasEnoughBerryPowder(gSpecialVar_0x8004))
src/field_specials.c
+3 -3
View File
@@ -1168,7 +1168,7 @@ static void Task_AnimateElevatorWindowView(u8 taskId)
data[1]++;
}
void Special_ListMenu(void)
void ListMenu(void)
{
u8 taskId;
struct Task * task;
@@ -1472,7 +1472,7 @@ static void Task_SuspendListMenu(u8 taskId)
}
}
void Special_ReturnToListMenu(void)
void ReturnToListMenu(void)
{
u8 taskId = FindTaskIdByFunc(Task_SuspendListMenu);
if (taskId == 0xFF)
@@ -1948,7 +1948,7 @@ void sub_80CC59C(void)
}
}
u16 Special_BattleCardAction(void)
u16 BattleCardAction(void)
{
switch (gSpecialVar_Result)
{
src/hof_pc.c
+1 -1
View File
@@ -39,7 +39,7 @@ static void ReshowPCMenuAfterHallOfFamePC(void)
{
ScriptContext2_Enable();
Overworld_PlaySpecialMapMusic();
ScrSpecial_CreatePCMenu();
CreatePCMenu();
ScriptMenu_DisplayPCStartupPrompt();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
CreateTask(Task_WaitForPaletteFade, 10);
src/menews_jisan.c
+1 -1
View File
@@ -54,7 +54,7 @@ void MENewsJisanStepCounter(void)
}
}
u16 Special_GetMENewsJisanItemAndState(void)
u16 GetMENewsJisanItemAndState(void)
{
u16 *r6 = &gSpecialVar_Result;
struct MENewsJisanStruct *r4 = GetMENewsJisanStructPtr();
src/quest_log.c
+8 -8
View File
@@ -2151,7 +2151,7 @@ void ResetTrainerFanClub(void)
VarSet(VAR_FANCLUB_LOSE_FAN_TIMER, 0);
}
void Special_TryLoseFansFromPlayTimeAfterLinkBattle(void)
void Script_TryLoseFansFromPlayTimeAfterLinkBattle(void)
{
TryLoseFansFromPlayTimeAfterLinkBattle(TRAINER_FAN_CLUB);
}
@@ -2165,7 +2165,7 @@ static void TryLoseFansFromPlayTimeAfterLinkBattle(struct TrainerFanClub *fanClu
}
}
void Special_UpdateTrainerFanClubGameClear(void)
void Script_UpdateTrainerFanClubGameClear(void)
{
UpdateTrainerFanClubGameClear(TRAINER_FAN_CLUB);
}
@@ -2282,7 +2282,7 @@ static u8 PlayerLoseRandomTrainerFan(struct TrainerFanClub *fanClub)
return sFanClubMemberIds[idx];
}
u16 Special_GetNumFansOfPlayerInTrainerFanClub(void)
u16 Script_GetNumFansOfPlayerInTrainerFanClub(void)
{
return GetNumFansOfPlayerInTrainerFanClub(TRAINER_FAN_CLUB);
}
@@ -2301,7 +2301,7 @@ static u16 GetNumFansOfPlayerInTrainerFanClub(struct TrainerFanClub *fanClub)
return count;
}
void Special_TryLoseFansFromPlayTime(void)
void Script_TryLoseFansFromPlayTime(void)
{
TryLoseFansFromPlayTime(TRAINER_FAN_CLUB);
}
@@ -2335,7 +2335,7 @@ static void TryLoseFansFromPlayTime(struct TrainerFanClub *fanClub)
}
}
bool16 Special_IsFanClubMemberFanOfPlayer(void)
bool16 Script_IsFanClubMemberFanOfPlayer(void)
{
return IsFanClubMemberFanOfPlayer(TRAINER_FAN_CLUB);
}
@@ -2352,7 +2352,7 @@ static void SetInitialFansOfPlayer(struct TrainerFanClub *fanClub)
SET_TRAINER_FAN_CLUB_FLAG(FANCLUB_MEMBER3);
}
void Special_BufferFanClubTrainerName(void)
void Script_BufferFanClubTrainerName(void)
{
u8 whichLinkTrainer = 0;
u8 whichNPCTrainer = 0;
@@ -2446,7 +2446,7 @@ static bool8 DidPlayerGetFirstFans(struct TrainerFanClub *fanClub)
return fanClub->gotInitialFans;
}
void Special_SetPlayerGotFirstFans(void)
void Script_SetPlayerGotFirstFans(void)
{
SetPlayerGotFirstFans(TRAINER_FAN_CLUB);
}
@@ -2456,7 +2456,7 @@ static void SetPlayerGotFirstFans(struct TrainerFanClub *fanClub)
fanClub->gotInitialFans = TRUE;
}
u8 Special_TryGainNewFanFromCounter(void)
u8 Script_TryGainNewFanFromCounter(void)
{
return TryGainNewFanFromCounter(TRAINER_FAN_CLUB, gSpecialVar_0x8004);
}
src/script_menu.c
+1 -1
View File
@@ -944,7 +944,7 @@ static void Hask_MultichoiceGridMenu_HandleInput(u8 taskId)
EnableBothScriptContexts();
}
bool8 ScrSpecial_CreatePCMenu(void)
bool8 CreatePCMenu(void)
{
if (FuncIsActiveTask(Task_MultichoiceMenu_HandleInput) == TRUE)
return FALSE;
src/seagallop.c
+1 -1
View File
@@ -16,7 +16,7 @@
#include "field_weather.h"
#include "constants/songs.h"
#include "constants/maps.h"
#include "seagallop.h"
#include "constants/seagallop.h"
#define TILESTAG_FERRY 3000
#define TILESTAG_WAKE 4000