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

Sync some specials/drop unnecessary prefixes

Browse Source
This commit is contained in:
GriffinR
2020-03-03 16:18:45 -05:00
parent 1aa1f18972
commit 7af1b35d17
101 changed files with 440 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/cable_club.inc
+7 -7
View File
@@ -446,7 +446,7 @@ CableClub_EventScript_CheckPartyTradeRequirements:: @ 81BB79C
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare VAR_RESULT, 2
goto_if_lt CableClub_EventScript_NeedTwoMonsToTrade
specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty
specialvar VAR_RESULT, DoesPartyHaveEnigmaBerry
compare VAR_RESULT, TRUE
goto_if_eq CableClub_EventScript_CantTradeEnigmaBerry
setvar VAR_RESULT, TRUE
@@ -601,7 +601,7 @@ CableClub_EventScript_ShowBattleRecords:: @ 81BB8A7
lockall
fadescreen FADE_TO_BLACK
setvar VAR_0x8004, 0
special Special_BattleRecords
special ShowBattleRecords
waitstate
releaseall
end
@@ -760,7 +760,7 @@ TradeCenter_TerminateLink:: @ 81BB9F0
textcolor 3
messageautoscroll Text_TerminateLinkConfirmation
waitmessage
special sub_8081770
special ExitLinkRoom
end
CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC
@@ -775,7 +775,7 @@ CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04
lock
faceplayer
goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
specialvar VAR_RESULT, Special_BadEggInParty
specialvar VAR_RESULT, IsBadEggInParty
compare VAR_RESULT, TRUE
goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg
copyvar VAR_0x8007, VAR_LAST_TALKED
@@ -842,7 +842,7 @@ CableClub_EventScript_CheckPartyUnionRoomRequirements:: @ 81BBB1E
specialvar VAR_RESULT, CountPartyNonEggMons
compare VAR_RESULT, 2
goto_if_lt CableClub_EventScript_NeedTwoMonsForUnionRoom
specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty
specialvar VAR_RESULT, DoesPartyHaveEnigmaBerry
compare VAR_RESULT, TRUE
goto_if_eq CableClub_EventScript_NoEnigmaBerryInUnionRoom
setvar VAR_RESULT, TRUE
@@ -885,7 +885,7 @@ CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C
lock
faceplayer
goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
specialvar VAR_RESULT, Special_BadEggInParty
specialvar VAR_RESULT, IsBadEggInParty
compare VAR_RESULT, TRUE
goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg
specialvar VAR_RESULT, IsWirelessAdapterConnected
@@ -1149,7 +1149,7 @@ CableClub_EventScript_81BBFD8:: @ 81BBFD8
goto_if_eq CableClub_EventScript_AdapterNotConnected
special HelpSystem_Disable
fadescreen FADE_TO_BLACK
special Special_WirelessCommunicationScreen
special ShowWirelessCommunicationScreen
waitstate
msgbox CableClub_Text_ParticipantsStepUpToCounter
special HelpSystem_Enable
data/scripts/cave_of_origin.inc
+1 -1
View File
@@ -22,7 +22,7 @@ CaveOfOrigin_EventScript_Shake:: @ 81A74B7
setvar VAR_0x8005, 1
setvar VAR_0x8006, 8
setvar VAR_0x8007, 5
special Special_ShakeScreen
special ShakeScreen
waitstate
releaseall
end
data/scripts/field_moves.inc
+1 -1
View File
@@ -89,7 +89,7 @@ EventScript_UseRockSmash:: @ 81BE06F
applymovement VAR_LAST_TALKED, Movement_BreakRock
waitmovement 0
removeobject VAR_LAST_TALKED
special ScrSpecial_RockSmashWildEncounter
special RockSmashWildEncounter
compare VAR_RESULT, FALSE
goto_if_eq EventScript_RockSmashNoEncounter
waitstate
data/scripts/itemfinder.inc
+1 -1
View File
@@ -15,7 +15,7 @@ EventScript_DigUpItemPutInPocket::
waitmessage
delay 60
msgbox Text_PutItemAway
special Special_SetHiddenItemFlag
special SetHiddenItemFlag
releaseall
end
data/scripts/move_tutors.inc
+2 -2
View File
@@ -455,7 +455,7 @@ TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC
goto_if_set FLAG_TEMP_2, CapeBrinkTutor_EventScript_MoveJustTaught
getfirstpartymonname 0
msgbox Text_UltimateMoveThatMon
specialvar VAR_RESULT, Special_CapeBrinkGetMoveToTeachLeadPokemon
specialvar VAR_RESULT, CapeBrinkGetMoveToTeachLeadPokemon
compare VAR_RESULT, FALSE
goto_if_eq CapeBrinkTutor_EventScript_NoLeadStarter
copyvar VAR_0x8009, VAR_0x8005
@@ -496,7 +496,7 @@ CapeBrinkTutor_EventScript_TaughtAllMoves:: @ 81C4EA1
CapeBrinkTutor_EventScript_TaughtMove:: @ 81C4EAB
copyvar VAR_0x8005, VAR_0x8009
specialvar VAR_RESULT, Special_HasLearnedAllMovesFromCapeBrinkTutor
specialvar VAR_RESULT, HasLearnedAllMovesFromCapeBrinkTutor
compare VAR_RESULT, TRUE
goto_if_eq CapeBrinkTutor_EventScript_LearnedAllMoves
msgbox Text_TaughtMove
data/scripts/mystery_event_club.inc
+2 -2
View File
@@ -45,7 +45,7 @@ EventScript_CancelGiveProfile: @ 81BEE9E
EventScript_GaveProfile: @ 81BEEA8
setvar GAVE_PROFILE, TRUE
setvar VAR_0x8004, 0
special Special_BufferEasyChatMessage
special ShowEasyChatMessage
waitmessage
delay 80
msgbox Text_ProfileSaysSomethingAboutYou
@@ -92,7 +92,7 @@ EventScript_DeclineGiveNewProfile: @ 81BEF35
EventScript_GaveSpecialProfile: @ 81BEF3F
setvar GAVE_PROFILE, TRUE
setvar VAR_0x8004, 0
special Special_BufferEasyChatMessage
special ShowEasyChatMessage
waitmessage
delay 80
msgbox Text_HeardThatBefore
data/scripts/obtain_item.inc
+4 -4
View File
@@ -133,7 +133,7 @@ Std_FindItem:: @ 81A67B3
EventScript_PickUpItem:: @ 81A67EE
removeobject VAR_LAST_TALKED
additem VAR_0x8004, VAR_0x8005
specialvar VAR_RESULT, Special_ItemIsTM_GetMoveName
specialvar VAR_RESULT, BufferTMHMMoveName
copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, TRUE
call_if_eq EventScript_FoundTMHM
@@ -187,7 +187,7 @@ EventScript_PickedUpHiddenItem::
waitfanfare
waitmessage
msgbox Text_PutItemAway
special Special_SetHiddenItemFlag
special SetHiddenItemFlag
releaseall
end
@@ -215,7 +215,7 @@ EventScript_NoRoomForHiddenItem::
EventScript_TryPickUpHiddenCoins::
goto_if_unset FLAG_GOT_COIN_CASE, EventScript_NoCaseForHiddenCoins
checkcoins VAR_RESULT
specialvar VAR_RESULT, Special_CheckAddCoins
specialvar VAR_RESULT, CheckAddCoins
compare VAR_RESULT, FALSE
goto_if_eq EventScript_HiddenCoinsButCaseIsFull
addcoins VAR_0x8006
@@ -225,7 +225,7 @@ EventScript_TryPickUpHiddenCoins::
waitfanfare
waitmessage
msgbox Text_PutCoinsAwayInCoinCase
special Special_SetHiddenItemFlag
special SetHiddenItemFlag
releaseall
end
data/scripts/pc.inc
+2 -2
View File
@@ -5,7 +5,7 @@ EventScript_PC:: @ 81A6955
setvar VAR_0x8004, 27
special Special_SetSomeVariable
setvar VAR_0x8004, 0
special Special_AnimatePcTurnOn
special AnimatePcTurnOn
playse SE_PC_ON
msgbox Text_BootedUpPC
goto EventScript_PCMainMenu
@@ -66,7 +66,7 @@ EventScript_AccessBillsPC:: @ 81A6A3D
EventScript_TurnOffPC:: @ 81A6A46
setvar VAR_0x8004, 0
playse SE_PC_OFF
special Special_AnimatePcTurnOff
special AnimatePcTurnOff
special sub_812B35C
releaseall
end
data/scripts/pkmn_center_nurse.inc
+1 -1
View File
@@ -29,7 +29,7 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE
return
EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC
specialvar VAR_RESULT, Special_PlayerIsNotInTrainerTowerLobby
specialvar VAR_RESULT, IsPlayerNotInTrainerTowerLobby
compare VAR_RESULT, FALSE
goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn
specialvar VAR_RESULT, BufferUnionRoomPlayerName
data/scripts/pokedex_rating.inc
+3 -3
View File
@@ -16,7 +16,7 @@ PokedexRating_EventScript_NormalIntro:: @ 81A73AD
PokedexRating_EventScript_ShowRatingMsg:: @ 81A73B6
copyvar VAR_0x8004, VAR_0x8009
special Special_GetProfOaksRatingMessage
special GetProfOaksRatingMessage
waitmessage
compare VAR_RESULT, FALSE
call_if_eq PokedexRating_EventScript_NormalFanfare
@@ -39,7 +39,7 @@ PokedexRating_EventScript_Rate:: @ 81A73E0
special HelpSystem_BackupSomeVariable
special Special_SetSomeVariable
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
specialvar VAR_RESULT, GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
copyvar VAR_0x800A, VAR_RESULT
@@ -51,7 +51,7 @@ PokedexRating_EventScript_Rate:: @ 81A73E0
compare VAR_0x800A, FALSE
goto_if_eq PokedexRating_EventScript_EndRating @ National Dex not enabled
setvar VAR_0x8004, 1
specialvar VAR_RESULT, Special_GetPokedexCount
specialvar VAR_RESULT, GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
getnumberstring 0, VAR_0x8008 @ Num National Seen
data/scripts/pokemon_league.inc
+1 -1
View File
@@ -60,5 +60,5 @@ PokemonLeague_Movement_ForcePlayerIn:: @ 81A75D3
step_end
PokemonLeague_EventScript_DoLightingEffect:: @ 81A75D5
special Special_PokemonLeagueLightingEffect
special DoPokemonLeagueLightingEffect
return
data/scripts/questionnaire.inc
+1 -1
View File
@@ -8,7 +8,7 @@ EventScript_Questionnaire:: @ 81A7702
call Common_ShowEasyChatScreen
lock
faceplayer
specialvar VAR_0x8008, Special_GetMartClerkObjectId
specialvar VAR_0x8008, GetMartClerkObjectId
textcolor 0
compare VAR_0x8004, 0
goto_if_eq EventScript_EnableMysteryGift
data/scripts/seagallop.inc
+4 -4
View File
@@ -138,9 +138,9 @@ VermilionCity_Movement_WalkUp:: @ 81A911C
EventScript_SeviiDestinationsPage1:: @ 81A911E
setvar VAR_0x8005, 0
special Special_DrawSeagallopDestinationMenu
special DrawSeagallopDestinationMenu
waitstate
specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination
specialvar VAR_0x8006, GetSelectedSeagallopDestination
switch VAR_0x8006
case SEAGALLOP_VERMILION_CITY, EventScript_SailToVermilionCity
case SEAGALLOP_ONE_ISLAND, EventScript_SailToOneIsland
@@ -153,9 +153,9 @@ EventScript_SeviiDestinationsPage1:: @ 81A911E
EventScript_SeviiDestinationsPage2:: @ 81A917F
setvar VAR_0x8005, 1
special Special_DrawSeagallopDestinationMenu
special DrawSeagallopDestinationMenu
waitstate
specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination
specialvar VAR_0x8006, GetSelectedSeagallopDestination
switch VAR_0x8006
case SEAGALLOP_FOUR_ISLAND, EventScript_SailToFourIsland
case SEAGALLOP_FIVE_ISLAND, EventScript_SailToFiveIsland
data/scripts/silphco_doors.inc
+1 -1
View File
@@ -559,6 +559,6 @@ EventScript_OpenDoor:: @ 81A8B32
playse SE_KI_GASYAN
special DrawWholeMapView
waitse
special Special_SetHiddenItemFlag
special SetHiddenItemFlag
releaseall
end
data/scripts/trainer_battle.inc
+2 -2
View File
@@ -63,7 +63,7 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E
waitmessage
waitbuttonpress
goto_if_questlog EventScript_EndQuestLogRematch
special BattleSetup_StartRematchBattle
special StartRematchBattle
waitstate
releaseall
end
@@ -84,7 +84,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
waitmessage
waitbuttonpress
goto_if_questlog EventScript_EndQuestLogRematch
special BattleSetup_StartRematchBattle
special StartRematchBattle
waitstate
releaseall
end
data/scripts/trainer_card.inc
+1 -1
View File
@@ -47,7 +47,7 @@ CeladonCity_GameCorner_EventScript_PrintPhoto:: @ 81B2907
playse MUS_ME_PHOTO
dofieldeffect FLDEFF_UNK_45
delay 60
special Special_UpdateTrainerCardPhotoIcons
special UpdateTrainerCardPhotoIcons
msgbox CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard
hidemoneybox 0, 0
releaseall
data/scripts/white_out.inc
+2 -2
View File
@@ -55,7 +55,7 @@ EventScript_FieldWhiteOutNoMoney:: @ 81A8E2E
end
EventScript_FieldWhiteOutHasMoney:: @ 81A8E3C
special Special_OverworldWhiteOutGetMoneyLoss
special OverworldWhiteOutGetMoneyLoss
msgbox Text_WhitedOutLostMoney
goto EventScript_FieldWhiteOutFade
end
@@ -64,6 +64,6 @@ EventScript_FieldWhiteOutFade:: @ 81A8E4D
special Script_FadeOutMapMusic
waitstate
fadescreen FADE_TO_BLACK
special SetCB2Whiteout
special SetCB2WhiteOut
waitstate
end