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/maps/BirthIsland_Exterior/scripts.inc
+5 -5
View File
@@ -5,7 +5,7 @@ BirthIsland_Exterior_MapScripts:: @ 8165203
.byte 0
BirthIsland_Exterior_OnReturnToField:: @ 8165213
special Special_SetDeoxysTriangleObjectPal
special SetDeoxysTrianglePalette
end
BirthIsland_Exterior_OnTransition:: @ 8165217
@@ -33,7 +33,7 @@ BirthIsland_Exterior_OnResume:: @ 8165253
end
BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 816525D
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
removeobject 2
@@ -44,7 +44,7 @@ BirthIsland_Exterior_EventScript_Triangle:: @ 8165271
faceplayer
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special DoDeoxysRockInteraction
special DoDeoxysTriangleInteraction
waitstate
switch VAR_RESULT
case 0, BirthIsland_Exterior_EventScript_NotSolved1
@@ -86,10 +86,10 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0
setvar VAR_0x8006, ITEM_NONE
special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special Special_StartLegendaryBattle
special StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq BirthIsland_Exterior_EventScript_DefeatedDeoxys
compare VAR_RESULT, B_OUTCOME_RAN
data/maps/CeladonCity_Condominiums_3F/scripts.inc
+1 -1
View File
@@ -32,7 +32,7 @@ CeladonCity_Condominiums_3F_EventScript_ShowDiploma:: @ 816C418
waitmessage
delay 60
goto_if_questlog EventScript_ReleaseEnd
special Special_ShowDiploma
special ShowDiploma
waitstate
release
end
data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
+5 -5
View File
@@ -6,11 +6,11 @@ CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect:: @ 816C153
setvar VAR_0x8004, 3
call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
special DrawElevatorCurrentFloorWindow
message Text_WantWhichFloor
waitmessage
setvar VAR_0x8004, 3
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos
switch VAR_RESULT
case 0, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F
case 1, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F
@@ -106,15 +106,15 @@ CeladonCity_DepartmentStore_Elevator_EventScript_To5F:: @ 816C2E6
end
CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect:: @ 816C30E
special Special_CloseElevatorCurrentFloorWindow
special CloseElevatorCurrentFloorWindow
releaseall
end
CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator:: @ 816C313
special Special_CloseElevatorCurrentFloorWindow
special CloseElevatorCurrentFloorWindow
closemessage
waitse
special Special_AnimateElevator
special AnimateElevator
waitstate
setflag FLAG_TEMP_2
return
data/maps/CeladonCity_GameCorner/scripts.inc
+1 -1
View File
@@ -259,7 +259,7 @@ CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C
setfieldeffectarg 2, 14
dofieldeffect FLDEFF_SMILEY_FACE_ICON
waitfieldeffect FLDEFF_SMILEY_FACE_ICON
specialvar VAR_RESULT, Special_GetRandomSlotMachine
specialvar VAR_RESULT, GetRandomSlotMachineId
playslotmachine VAR_RESULT
releaseall
end
data/maps/CeruleanCave_B1F/scripts.inc
+3 -3
View File
@@ -8,7 +8,7 @@ CeruleanCave_B1F_OnResume:: @ 81624C9
end
CeruleanCave_B1F_EventScript_TryRemoveMewtwo:: @ 81624D3
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
removeobject VAR_LAST_TALKED
@@ -37,10 +37,10 @@ CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5
waitbuttonpress
setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special Special_StartLegendaryBattle
special StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq CeruleanCave_B1F_EventScript_DefeatedMewtwo
compare VAR_RESULT, B_OUTCOME_RAN
data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
+1 -1
View File
@@ -53,7 +53,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_Norma:: @ 816E33E
msgbox Trade_Text_DoYouHaveMonWantToTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade
special Special_ChooseMonFromParty
special ChoosePartyMon
waitstate
copyvar VAR_0x800A, VAR_0x8004
compare VAR_0x8004, PARTY_SIZE
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong:: @ 8171F0B
FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon:: @ 8171F19
copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
compare VAR_RESULT, TRUE
goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon
goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon
data/maps/FourIsland/scripts.inc
+1 -1
View File
@@ -132,7 +132,7 @@ FourIsland_EventScript_CheckOnTwoMons:: @ 8167E19
special GetDaycareMonNicknames
msgbox DayCare_Text_YourMonsAreDoingFine
special SetDaycareCompatibilityString
special Special_ShowStringVar4AsFieldMessage
special ShowFieldMessageStringVar4
waitmessage
waitbuttonpress
release
data/maps/FourIsland_IcefallCave_1F/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ FourIsland_IcefallCave_1F_OnResume:: @ 8163D54
end
FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57
special Special_SetIcefallCaveCrackedIceMetatiles
special SetIcefallCaveCrackedIceMetatiles
end
FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B
data/maps/FourIsland_LoreleisHouse/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E
.byte 0
FourIsland_LoreleisHouse_OnTransition:: @ 8171C54
special Special_ComputeLoreleiDollCollection
special UpdateLoreleiDollCollection
end
FourIsland_LoreleisHouse_EventScript_Lorelei:: @ 8171C58
data/maps/FuchsiaCity/scripts.inc
+7 -7
View File
@@ -71,7 +71,7 @@ FuchsiaCity_EventScript_GymSign:: @ 8166E07
FuchsiaCity_EventScript_ChanseySign:: @ 8166E1F
lockall
setvar VAR_0x8004, SPECIES_CHANSEY
special Special_SetSeenMon
special SetSeenMon
drawmonpic SPECIES_CHANSEY, 10, 3
msgbox FuchsiaCity_Text_ChanseySign
erasemonpic
@@ -81,7 +81,7 @@ FuchsiaCity_EventScript_ChanseySign:: @ 8166E1F
FuchsiaCity_EventScript_VoltorbSign:: @ 8166E38
lockall
setvar VAR_0x8004, SPECIES_VOLTORB
special Special_SetSeenMon
special SetSeenMon
drawmonpic SPECIES_VOLTORB, 10, 3
msgbox FuchsiaCity_Text_VoltorbSign
erasemonpic
@@ -91,7 +91,7 @@ FuchsiaCity_EventScript_VoltorbSign:: @ 8166E38
FuchsiaCity_EventScript_KangaskhanSign:: @ 8166E51
lockall
setvar VAR_0x8004, SPECIES_KANGASKHAN
special Special_SetSeenMon
special SetSeenMon
drawmonpic SPECIES_KANGASKHAN, 10, 3
msgbox FuchsiaCity_Text_KangaskhanSign
erasemonpic
@@ -101,7 +101,7 @@ FuchsiaCity_EventScript_KangaskhanSign:: @ 8166E51
FuchsiaCity_EventScript_SlowpokeSign:: @ 8166E6A
lockall
setvar VAR_0x8004, SPECIES_SLOWPOKE
special Special_SetSeenMon
special SetSeenMon
drawmonpic SPECIES_SLOWPOKE, 10, 3
msgbox FuchsiaCity_Text_SlowpokeSign
erasemonpic
@@ -111,7 +111,7 @@ FuchsiaCity_EventScript_SlowpokeSign:: @ 8166E6A
FuchsiaCity_EventScript_LaprasSign:: @ 8166E83
lockall
setvar VAR_0x8004, SPECIES_LAPRAS
special Special_SetSeenMon
special SetSeenMon
drawmonpic SPECIES_LAPRAS, 10, 3
msgbox FuchsiaCity_Text_LaprasSign
erasemonpic
@@ -122,7 +122,7 @@ FuchsiaCity_EventScript_FossilMonSign:: @ 8166E9C
lockall
goto_if_set FLAG_GOT_DOME_FOSSIL, FuchsiaCity_EventScript_OmanyteSign
setvar VAR_0x8004, SPECIES_KABUTO
special Special_SetSeenMon
special SetSeenMon
drawmonpic SPECIES_KABUTO, 10, 3
msgbox FuchsiaCity_Text_KabutoSign
erasemonpic
@@ -131,7 +131,7 @@ FuchsiaCity_EventScript_FossilMonSign:: @ 8166E9C
FuchsiaCity_EventScript_OmanyteSign:: @ 8166EBE
setvar VAR_0x8004, SPECIES_OMANYTE
special Special_SetSeenMon
special SetSeenMon
drawmonpic SPECIES_OMANYTE, 10, 3
msgbox FuchsiaCity_Text_OmanyteSign
erasemonpic
data/maps/FuchsiaCity_House3/scripts.inc
+7 -7
View File
@@ -12,23 +12,23 @@ FuchsiaCity_House3_EventScript_MoveDeleter:: @ 816D895
FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: @ 816D8B0
msgbox FuchsiaCity_House3_Text_WhichMonShouldForgetMove
special Special_ChooseMonFromParty
special ChoosePartyMon
waitstate
compare VAR_0x8004, PARTY_SIZE
goto_if_ge FuchsiaCity_House3_EventScript_CancelForgetMove
special Special_IsSelectedMonEgg
special IsSelectedMonEgg
compare VAR_RESULT, TRUE
goto_if_eq FuchsiaCity_House3_EventScript_CantForgetMoveEgg
special Special_GetNumMovesSelectedMonHas
special GetNumMovesSelectedMonHas
compare VAR_RESULT, 1
goto_if_eq FuchsiaCity_House3_EventScript_CantForgetOnlyMove
msgbox FuchsiaCity_House3_Text_WhichMoveShouldBeForgotten
fadescreen FADE_TO_BLACK
special Special_SelectMove
special SelectMoveDeleterMove
fadescreen FADE_FROM_BLACK
compare VAR_0x8005, MAX_MON_MOVES
goto_if_eq FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter
special Special_BufferMoveDeleterNicknameAndMove
special BufferMoveDeleterNicknameAndMove
msgbox FuchsiaCity_House3_Text_MonsMoveShouldBeForgotten, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq FuchsiaCity_House3_EventScript_ForgetMove
@@ -36,7 +36,7 @@ FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: @ 816D8B0
end
FuchsiaCity_House3_EventScript_ForgetMove:: @ 816D919
special Special_MoveDeleterForgetMove
special MoveDeleterForgetMove
playfanfare MUS_ME_WASURE
waitfanfare
msgbox FuchsiaCity_House3_Text_MonHasForgottenMoveCompletely
@@ -44,7 +44,7 @@ FuchsiaCity_House3_EventScript_ForgetMove:: @ 816D919
end
FuchsiaCity_House3_EventScript_CantForgetOnlyMove:: @ 816D92A
special Special_BufferMoveDeleterNicknameAndMove
special BufferMoveDeleterNicknameAndMove
msgbox FuchsiaCity_House3_Text_MonOnlyKnowsOneMove
release
end
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+1 -1
View File
@@ -158,7 +158,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_CheckSpaceForMons:: @ 816D462
getpartysize
compare VAR_RESULT, PARTY_SIZE
goto_if_ne EventScript_Return
specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon
specialvar VAR_RESULT, IsThereRoomInAnyBoxForMorePokemon
compare VAR_RESULT, TRUE
goto_if_eq EventScript_Return
msgbox SafariZone_Text_ExcuseMeYourPCBoxIsFull
data/maps/IndigoPlateau_Exterior/scripts.inc
+1 -1
View File
@@ -81,7 +81,7 @@ IndigoPlateau_Exterior_EventScript_Credits:: @ 8167264
setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0
removeobject LOCALID_RIVAL
removeobject LOCALID_PROF_OAK
special Special_Credits @ noreturn
special DoCredits
waitstate
releaseall
end
data/maps/LavenderTown_House2/scripts.inc
+7 -7
View File
@@ -13,7 +13,7 @@ LavenderTown_House2_EventScript_NameRater:: @ 816B266
LavenderTown_House2_EventScript_ChooseMon:: @ 816B287
msgbox LavenderTown_House2_Text_CritiqueWhichMonsNickname
special Special_ChooseMonFromParty
special ChoosePartyMon
waitstate
compare VAR_0x8004, PARTY_SIZE
goto_if_lt LavenderTown_House2_EventScript_CheckCanRateMon
@@ -27,15 +27,15 @@ LavenderTown_House2_EventScript_DontRateNickname:: @ 816B2AA
end
LavenderTown_House2_EventScript_CheckCanRateMon:: @ 816B2B4
specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
specialvar VAR_RESULT, GetPartyMonSpecies
compare VAR_RESULT, SPECIES_EGG
goto_if_eq LavenderTown_House2_EventScript_CantNicknameEgg
special Special_GetMonNickname
special Special_IsMonOTIDNotPlayers
special BufferMonNickname
special IsMonOTIDNotPlayers
compare VAR_RESULT, TRUE
goto_if_eq LavenderTown_House2_EventScript_CantNicknameTradeMon
specialvar VAR_RESULT, Special_IsMonOTNameNotPlayers
special Special_GetMonNickname
specialvar VAR_RESULT, IsMonOTNameNotPlayers
special BufferMonNickname
compare VAR_RESULT, TRUE
goto_if_eq LavenderTown_House2_EventScript_CantNicknameTradeMon
msgbox LavenderTown_House2_Text_GiveItANicerName, MSGBOX_YESNO
@@ -59,7 +59,7 @@ LavenderTown_House2_EventScript_ChooseNewNickname:: @ 816B31B
msgbox LavenderTown_House2_Text_WhatShallNewNicknameBe
call EventScript_ChangePokemonNickname
specialvar VAR_RESULT, NameRaterWasNicknameChanged
special Special_GetMonNickname
special BufferMonNickname
compare VAR_RESULT, TRUE
goto_if_eq LavenderTown_House2_EventScript_ChoseNewNickname
msgbox LavenderTown_House2_Text_FromNowOnShallBeKnownAsSameName
data/maps/MtEmber_Summit/scripts.inc
+3 -3
View File
@@ -8,7 +8,7 @@ MtEmber_Summit_OnResume:: @ 8163B07
end
MtEmber_Summit_EventScript_TryRemoveMoltres:: @ 8163B11
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
removeobject VAR_LAST_TALKED
@@ -37,10 +37,10 @@ MtEmber_Summit_EventScript_Moltres:: @ 8163B33
playbgm MUS_EXEYE, 0
waitbuttonpress
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special Special_StartLegendaryBattle
special StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq MtEmber_Summit_EventScript_DefeatedMoltres
compare VAR_RESULT, B_OUTCOME_RAN
data/maps/NavelRock_Base/scripts.inc
+5 -5
View File
@@ -22,7 +22,7 @@ NavelRock_Base_OnResume:: @ 8165116
end
NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
removeobject 1
@@ -40,14 +40,14 @@ NavelRock_Base_EventScript_Lugia:: @ 8165134
setvar VAR_0x8005, 3 @ Horizontal pan
setvar VAR_0x8006, 4 @ Num shakes
setvar VAR_0x8007, 2 @ Shake delay
special Special_ShakeScreen
special ShakeScreen
delay 30
playse SE_T_AME_E
setvar VAR_0x8004, 0 @ Vertical pan
setvar VAR_0x8005, 3 @ Horizontal pan
setvar VAR_0x8006, 4 @ Num shakes
setvar VAR_0x8007, 2 @ Shake delay
special Special_ShakeScreen
special ShakeScreen
delay 30
delay 50
waitse
@@ -59,10 +59,10 @@ NavelRock_Base_EventScript_Lugia:: @ 8165134
setvar VAR_0x8006, ITEM_NONE
special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special Special_StartLegendaryBattle
special StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq NavelRock_Base_EventScript_DefeatedLugia
compare VAR_RESULT, B_OUTCOME_RAN
data/maps/NavelRock_Summit/scripts.inc
+5 -5
View File
@@ -25,7 +25,7 @@ NavelRock_Summit_OnResume:: @ 8164FDD
end
NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
removeobject 1
@@ -39,7 +39,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB
special SpawnCameraObject
setvar VAR_0x8004, 3 @ Num loops
setvar VAR_0x8005, 35 @ Delay
special Special_LoopWingFlapSound
special LoopWingFlapSound
applymovement 1, Movement_HoOhAppear
applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanUp
waitmovement 0
@@ -53,7 +53,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB
delay 60
setvar VAR_0x8004, 3 @ Num loops
setvar VAR_0x8005, 35 @ Delay
special Special_LoopWingFlapSound
special LoopWingFlapSound
applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanDown
applymovement 1, Movement_HoOhApproach
waitmovement 0
@@ -63,11 +63,11 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB
setvar VAR_0x8006, ITEM_NONE
special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special Special_StartLegendaryBattle
special StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
setvar VAR_LAST_TALKED, 1
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq NavelRock_Summit_EventScript_DefeatedHoOh
compare VAR_RESULT, B_OUTCOME_RAN
data/maps/PalletTown/scripts.inc
+1 -1
View File
@@ -56,7 +56,7 @@ PalletTown_EventScript_OakRatingScene:: @ 81654D8
goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, PalletTown_EventScript_NotBeenToOneIslandYet
msgbox PalletTown_Text_OakLetMeSeePokedex
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
specialvar VAR_RESULT, GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
getnumberstring 0, VAR_0x8008
data/maps/PalletTown_GarysHouse/scripts.inc
+4 -4
View File
@@ -57,13 +57,13 @@ PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9
compare VAR_RESULT, NO
goto_if_eq PalletTown_GarysHouse_EventScript_DeclineGrooming
msgbox PalletTown_GarysHouse_Text_GroomWhichOne
special Special_ChooseMonFromParty
special ChoosePartyMon
waitstate
lock
faceplayer
compare VAR_0x8004, PARTY_SIZE
goto_if_ge PalletTown_GarysHouse_EventScript_DeclineGrooming
specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
specialvar VAR_RESULT, GetPartyMonSpecies
compare VAR_RESULT, SPECIES_EGG
goto_if_eq PalletTown_GarysHouse_EventScript_CantGroomEgg
msgbox PalletTown_GarysHouse_Text_LookingNiceInNoTime
@@ -71,9 +71,9 @@ PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9
fadescreen FADE_TO_BLACK
playfanfare MUS_ME_ASA
waitfanfare
special Special_DaisyMassageServices
special DaisyMassageServices
fadescreen FADE_FROM_BLACK
special Special_GetMonNickname
special BufferMonNickname
msgbox PalletTown_GarysHouse_Text_ThereYouGoAllDone
release
end
data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+2 -2
View File
@@ -35,7 +35,7 @@ PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4
setvar VAR_0x8004, 32
special Special_SetSomeVariable
setvar VAR_0x8004, 1
special Special_AnimatePcTurnOn
special AnimatePcTurnOn
playse SE_PC_ON
msgbox Text_PlayerBootedUpPC
special BedroomPC
@@ -47,7 +47,7 @@ PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4
EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17
setvar VAR_0x8004, 1
playse SE_PC_OFF
special Special_AnimatePcTurnOff
special AnimatePcTurnOff
special sub_812B35C
releaseall
end
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+1 -1
View File
@@ -849,7 +849,7 @@ PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth:: @ 81698D0
PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls:: @ 81698D6
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
specialvar VAR_RESULT, GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
getnumberstring 0, VAR_0x8008
data/maps/PewterCity_Museum_1F/scripts.inc
+4 -4
View File
@@ -182,9 +182,9 @@ PewterCity_Museum_1F_EventScript_AerodactylFossil:: @ 816A512
setvar VAR_0x8004, SPECIES_AERODACTYL
setvar VAR_0x8005, 10
setvar VAR_0x8006, 3
special Special_OpenMuseumFossilPic
special OpenMuseumFossilPic
msgbox PewterCity_Museum_1F_Text_AerodactylFossil
special Special_CloseMuseumFossilPic
special CloseMuseumFossilPic
releaseall
end
@@ -193,8 +193,8 @@ PewterCity_Museum_1F_EventScript_KabutopsFossil:: @ 816A532
setvar VAR_0x8004, SPECIES_KABUTOPS
setvar VAR_0x8005, 10
setvar VAR_0x8006, 3
special Special_OpenMuseumFossilPic
special OpenMuseumFossilPic
msgbox PewterCity_Museum_1F_Text_KabutopsFossil
special Special_CloseMuseumFossilPic
special CloseMuseumFossilPic
releaseall
end
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+1 -1
View File
@@ -78,7 +78,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76
applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter
waitmovement 0
delay 25
specialvar VAR_RESULT, ScrSpecial_GetStarter
specialvar VAR_RESULT, GetStarterSpecies
getspeciesname 0, VAR_RESULT
msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestRight
data/maps/PokemonLeague_HallOfFame/scripts.inc
+1 -1
View File
@@ -37,7 +37,7 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom:: @ 8162D70
call EventScript_SetDefeatedEliteFourFlagsVars
setrespawn SPAWN_PALLET_TOWN
fadescreenspeed FADE_TO_BLACK, 24
special Special_HallOfFame
special EnterHallOfFame
waitstate
releaseall
end
data/maps/PokemonTower_6F/scripts.inc
+1 -1
View File
@@ -7,7 +7,7 @@ PokemonTower_6F_EventScript_MarowakGhost:: @ 81634B8
msgbox PokemonTower_6F_Text_BeGoneIntruders
goto_if_questlog EventScript_ReleaseEnd
setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
special ScrSpecial_StartMarowakBattle
special StartMarowakBattle
waitstate
special sub_8112364
compare VAR_RESULT, FALSE @ Set by CB2_EndMarowakBattle
data/maps/PowerPlant/scripts.inc
+5 -5
View File
@@ -8,7 +8,7 @@ PowerPlant_OnResume:: @ 816376F
end
PowerPlant_EventScript_TryRemoveStaticMon:: @ 8163779
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
removeobject VAR_LAST_TALKED
@@ -48,10 +48,10 @@ PowerPlant_EventScript_Zapdos:: @ 81637B8
playbgm MUS_EXEYE, 0
waitbuttonpress
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special Special_StartLegendaryBattle
special StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq PowerPlant_EventScript_DefeatedZapdos
compare VAR_RESULT, B_OUTCOME_RAN
@@ -85,7 +85,7 @@ PowerPlant_EventScript_Electrode1:: @ 816382F
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_8112364
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq PowerPlant_EventScript_FoughtElectrode1
compare VAR_RESULT, B_OUTCOME_RAN
@@ -114,7 +114,7 @@ PowerPlant_EventScript_Electrode2:: @ 816388D
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_8112364
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq PowerPlant_EventScript_FoughtElectrode2
compare VAR_RESULT, B_OUTCOME_RAN
data/maps/RocketHideout_Elevator/scripts.inc
+5 -5
View File
@@ -7,11 +7,11 @@ RocketHideout_Elevator_EventScript_FloorSelect:: @ 81614D9
setvar VAR_0x8004, 2
call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
special DrawElevatorCurrentFloorWindow
message Text_WantWhichFloor
waitmessage
setvar VAR_0x8004, 2
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos
switch VAR_RESULT
case 0, RocketHideout_Elevator_EventScript_FloorSelectFromB1F
case 1, RocketHideout_Elevator_EventScript_FloorSelectFromB2F
@@ -73,15 +73,15 @@ RocketHideout_Elevator_EventScript_ToB4F:: @ 81615E1
end
RocketHideout_Elevator_EventScript_ExitFloorSelect:: @ 8161609
special Special_CloseElevatorCurrentFloorWindow
special CloseElevatorCurrentFloorWindow
releaseall
end
RocketHideout_Elevator_EventScript_MoveElevator:: @ 816160E
special Special_CloseElevatorCurrentFloorWindow
special CloseElevatorCurrentFloorWindow
closemessage
waitse
special Special_AnimateElevator
special AnimateElevator
waitstate
setflag FLAG_TEMP_2
return
data/maps/Route10_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -38,7 +38,7 @@ Route10_PokemonCenter_1F_EventScript_Aide:: @ 816FC65
compare VAR_RESULT, NO
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
specialvar VAR_RESULT, GetPokedexCount
getnumberstring 2, VAR_0x8006
call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo
compare VAR_0x8006, REQUIRED_OWNED_MONS
data/maps/Route11_EastEntrance_2F/scripts.inc
+1 -1
View File
@@ -65,7 +65,7 @@ Route11_EastEntrance_2F_EventScript_Aide:: @ 816FDD8
compare VAR_RESULT, NO
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
specialvar VAR_RESULT, GetPokedexCount
getnumberstring 2, VAR_0x8006
call Route11_EastEntrance_2F_EventScript_GetAideRequestInfo
compare VAR_0x8006, REQUIRED_CAUGHT_MONS
data/maps/Route12/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ Route12_EventScript_Snorlax:: @ 8168014
setflag FLAG_WOKE_UP_ROUTE_12_SNORLAX
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq Route12_EventScript_FoughtSnorlax
compare VAR_RESULT, B_OUTCOME_RAN
data/maps/Route12_FishingHouse/scripts.inc
+2 -2
View File
@@ -33,12 +33,12 @@ Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
setvar VAR_0x8004, SPECIES_MAGIKARP
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
compare VAR_RESULT, FALSE
goto_if_eq Route12_FishingHouse_EventScript_NoMagikarpInParty
special GetMagikarpSizeRecordInfo
msgbox Route12_FishingHouse_Text_OhMagikarpAllowMeToSee
special Special_ChooseMonFromParty
special ChoosePartyMon
waitstate
copyvar VAR_RESULT, VAR_0x8004
compare VAR_RESULT, PARTY_SIZE
data/maps/Route15_WestEntrance_2F/scripts.inc
+2 -2
View File
@@ -11,7 +11,7 @@ Route15_WestEntrance_2F_EventScript_LeftBinoculars:: @ 8170093
waitbuttonpress
erasemonpic
setvar VAR_0x8004, SPECIES_ARTICUNO
special Special_SetSeenMon
special SetSeenMon
releaseall
end
@@ -28,7 +28,7 @@ Route15_WestEntrance_2F_EventScript_Aide:: @ 81700B9
compare VAR_RESULT, NO
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
specialvar VAR_RESULT, GetPokedexCount
getnumberstring 2, VAR_0x8006
call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo
compare VAR_0x8006, REQUIRED_CAUGHT_MONS
data/maps/Route16/scripts.inc
+2 -2
View File
@@ -26,7 +26,7 @@ Route16_OnWarp:: @ 8168113
.2byte 0
Route16_OnWarpCyclingRoad:: @ 816811D
special Special_ForcePlayerOntoBike
special ForcePlayerOntoBike
end
Route16_EventScript_Snorlax:: @ 8168121
@@ -48,7 +48,7 @@ Route16_EventScript_Snorlax:: @ 8168121
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq Route16_EventScript_FoughtSnorlax
compare VAR_RESULT, B_OUTCOME_RAN
data/maps/Route16_NorthEntrance_2F/scripts.inc
+1 -1
View File
@@ -28,7 +28,7 @@ Route16_NorthEntrance_2F_EventScript_Aide:: @ 81702E3
compare VAR_RESULT, NO
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
specialvar VAR_RESULT, GetPokedexCount
getnumberstring 2, VAR_0x8006
call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo
compare VAR_0x8006, REQUIRED_CAUGHT_MONS
data/maps/Route18/scripts.inc
+1 -1
View File
@@ -17,7 +17,7 @@ Route18_OnWarp:: @ 8168211
.2byte 0
Route18_OnWarpCyclingRoad:: @ 816821B
special Special_ForcePlayerOntoBike
special ForcePlayerOntoBike
end
Route18_EventScript_RouteSign:: @ 816821F
data/maps/Route25_SeaCottage/scripts.inc
+4 -4
View File
@@ -262,7 +262,7 @@ Route25_SeaCottage_EventScript_ViewEevee:: @ 817082B
waitbuttonpress
erasemonpic
setvar VAR_0x8004, SPECIES_EEVEE
special Special_SetSeenMon
special SetSeenMon
goto Route25_SeaCottage_EventScript_BillsMonList
end
@@ -271,7 +271,7 @@ Route25_SeaCottage_EventScript_ViewFlareon:: @ 8170840
waitbuttonpress
erasemonpic
setvar VAR_0x8004, SPECIES_FLAREON
special Special_SetSeenMon
special SetSeenMon
goto Route25_SeaCottage_EventScript_BillsMonList
end
@@ -280,7 +280,7 @@ Route25_SeaCottage_EventScript_ViewJolteon:: @ 8170855
waitbuttonpress
erasemonpic
setvar VAR_0x8004, SPECIES_JOLTEON
special Special_SetSeenMon
special SetSeenMon
goto Route25_SeaCottage_EventScript_BillsMonList
end
@@ -289,7 +289,7 @@ Route25_SeaCottage_EventScript_ViewVaporeon:: @ 817086A
waitbuttonpress
erasemonpic
setvar VAR_0x8004, SPECIES_VAPOREON
special Special_SetSeenMon
special SetSeenMon
goto Route25_SeaCottage_EventScript_BillsMonList
end
data/maps/Route2_EastBuilding/scripts.inc
+1 -1
View File
@@ -12,7 +12,7 @@ Route2_EastBuilding_EventScript_Aide:: @ 816F67F
compare VAR_RESULT, NO
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
specialvar VAR_RESULT, GetPokedexCount
getnumberstring 2, VAR_0x8006
call Route2_EastBuilding_EventScript_GetAideRequestInfo
compare VAR_0x8006, REQUIRED_SEEN_MONS
data/maps/SSAnne_2F_Room1/scripts.inc
+1 -1
View File
@@ -7,7 +7,7 @@ SSAnne_2F_Room1_EventScript_Gentleman:: @ 8160C97
message SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis
waitmessage
setvar VAR_0x8004, SPECIES_SNORLAX
special Special_SetSeenMon
special SetSeenMon
drawmonpic SPECIES_SNORLAX, 10, 3
waitbuttonpress
erasemonpic
data/maps/SSAnne_Exterior/scripts.inc
+1 -1
View File
@@ -20,7 +20,7 @@ SSAnne_Exterior_ExitSSAnne:: @ 8160859
call_if_ge SSAnne_Exterior_WalkInPlaceDown
fadenewbgm MUS_NAMINORI
delay 50
special Special_SSAnneDepartureCutscene
special DoSSAnneDepartureCutscene
waitstate
removeobject 1
applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_Exit
data/maps/SeafoamIslands_B4F/scripts.inc
+4 -4
View File
@@ -13,7 +13,7 @@ SeafoamIslands_B4F_OnResume:: @ 8163048
end
SeafoamIslands_B4F_EventScript_TryRemoveArticuno:: @ 8163052
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
removeobject VAR_LAST_TALKED
@@ -64,7 +64,7 @@ SeafoamIslands_B4F_OnWarp:: @ 81630E7
SeafoamIslands_B4F_EventScript_WarpInOnCurrent:: @ 81630F1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
special Special_ForcePlayerToStartSurfing
special ForcePlayerToStartSurfing
end
SeafoamIslands_B4F_OnFrame:: @ 81630F9
@@ -172,10 +172,10 @@ SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC
playbgm MUS_EXEYE, 0
waitbuttonpress
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special Special_StartLegendaryBattle
special StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq SeafoamIslands_B4F_EventScript_DefeatedArticuno
compare VAR_RESULT, B_OUTCOME_RAN
data/maps/SevenIsland_House_Room2/scripts.inc
+2 -2
View File
@@ -46,14 +46,14 @@ SevenIsland_House_Room2_EventScript_BattleTie:: @ 8170AFE
SevenIsland_House_Room2_EventScript_BattleWon:: @ 8170B0C
setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
special Special_ShowStringVar4AsFieldMessage
special ShowFieldMessageStringVar4
waitmessage
waitbuttonpress
return
SevenIsland_House_Room2_EventScript_BattleLost:: @ 8170B17
setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2
special Special_ShowStringVar4AsFieldMessage
special ShowFieldMessageStringVar4
waitmessage
waitbuttonpress
return
data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc
+3 -3
View File
@@ -111,7 +111,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E
setvar VAR_0x8005, 1
setvar VAR_0x8006, 8
setvar VAR_0x8007, 3
special Special_ShakeScreen
special ShakeScreen
delay 60
return
@@ -120,13 +120,13 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164
setvar VAR_0x8005, 2
setvar VAR_0x8006, 10
setvar VAR_0x8007, 3
special Special_ShakeScreen
special ShakeScreen
delay 60
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
setvar VAR_0x8006, 12
setvar VAR_0x8007, 2
special Special_ShakeScreen
special ShakeScreen
delay 60
playse SE_FU_ZUZUZU
waitse
data/maps/SilphCo_Elevator/scripts.inc
+5 -5
View File
@@ -6,11 +6,11 @@ SilphCo_Elevator_EventScript_FloorSelect:: @ 8161F6F
setvar VAR_0x8004, 1
call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
special DrawElevatorCurrentFloorWindow
message Text_WantWhichFloor
waitmessage
setvar VAR_0x8004, LISTMENU_SILPHCO_FLOORS
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos
special Special_ListMenu
waitstate
switch VAR_RESULT
@@ -140,15 +140,15 @@ SilphCo_Elevator_EventScript_To11F:: @ 81621BF
end
SilphCo_Elevator_EventScript_ExitFloorSelect:: @ 81621E7
special Special_CloseElevatorCurrentFloorWindow
special CloseElevatorCurrentFloorWindow
releaseall
end
SilphCo_Elevator_EventScript_MoveElevator:: @ 81621EC
special Special_CloseElevatorCurrentFloorWindow
special CloseElevatorCurrentFloorWindow
closemessage
waitse
special Special_AnimateElevator
special AnimateElevator
waitstate
setflag FLAG_TEMP_2
return
data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+1 -1
View File
@@ -31,7 +31,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5
setvar VAR_0x8005, 0
setvar VAR_0x8006, 12
setvar VAR_0x8007, 3
special Special_ShakeScreen
special ShakeScreen
delay 60
compare VAR_FACING, DIR_NORTH
call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth
data/maps/SixIsland_WaterPath_House1/scripts.inc
+2 -2
View File
@@ -7,12 +7,12 @@ SixIsland_WaterPath_House1_EventScript_Beauty:: @ 817206D
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
setvar VAR_0x8004, SPECIES_HERACROSS
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
compare VAR_RESULT, FALSE
goto_if_eq SixIsland_WaterPath_House1_EventScript_NoHeracrossInParty
special GetHeracrossSizeRecordInfo
msgbox SixIsland_WaterPath_House1_Text_MayIMeasureHeracross
special Special_ChooseMonFromParty
special ChoosePartyMon
waitstate
copyvar VAR_RESULT, VAR_0x8004
compare VAR_RESULT, PARTY_SIZE
data/maps/ThreeIsland_BerryForest/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83
giveitem ITEM_IAPAPA_BERRY
compare VAR_RESULT, FALSE
call_if_eq ThreeIsland_BerryForest_EventScript_NoRoomForBerry
special Special_BufferBigGuyOrBigGirlString
special BufferBigGuyOrBigGirlString
msgbox ThreeIsland_BerryForest_Text_LetsGoHome
closemessage
setflag FLAG_RESCUED_LOSTELLE
data/maps/ThreeIsland_House1/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ ThreeIsland_House1_MapScripts:: @ 8171819
ThreeIsland_House1_EventScript_Lostelle:: @ 817181A
lock
faceplayer
special Special_BufferBigGuyOrBigGirlString
special BufferBigGuyOrBigGirlString
msgbox ThreeIsland_House1_Text_YoureAlwaysSoCool
release
end
data/maps/TrainerTower_Elevator/scripts.inc
+6 -6
View File
@@ -8,11 +8,11 @@ TrainerTower_Elevator_EventScript_FloorSelect:: @ 8164B03
setvar VAR_0x8004, 6
call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
special DrawElevatorCurrentFloorWindow
message Text_WantWhichFloor
waitmessage
setvar VAR_0x8004, 6
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
specialvar VAR_RESULT, InitElevatorFloorSelectMenuPos
switch VAR_RESULT
case 0, TrainerTower_Elevator_EventScript_FloorSelectFromRoof
case 1, TrainerTower_Elevator_EventScript_FloorSelectFromLobby
@@ -43,7 +43,7 @@ TrainerTower_Elevator_EventScript_SelectLobby:: @ 8164B90
goto_if_eq TrainerTower_Elevator_EventScript_CloseFloorSelect
call TrainerTower_Elevator_EventScript_MoveElevator
setvar VAR_ELEVATOR_FLOOR, 3
special Special_CloseElevatorCurrentFloorWindow
special CloseElevatorCurrentFloorWindow
delay 25
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator
waitmovement 0
@@ -57,15 +57,15 @@ TrainerTower_Elevator_EventScript_SelectRoof:: @ 8164BCD
end
TrainerTower_Elevator_EventScript_CloseFloorSelect:: @ 8164BD3
special Special_CloseElevatorCurrentFloorWindow
special CloseElevatorCurrentFloorWindow
releaseall
end
TrainerTower_Elevator_EventScript_MoveElevator:: @ 8164BD8
special Special_CloseElevatorCurrentFloorWindow
special CloseElevatorCurrentFloorWindow
closemessage
waitse
special Special_AnimateElevator
special AnimateElevator
waitstate
setflag FLAG_TEMP_2
return
data/maps/TrainerTower_Lobby/scripts.inc
+1 -1
View File
@@ -212,7 +212,7 @@ TrainerTower_Lobby_EventScript_ShowRecords:: @ 8164AD8
lockall
fadescreen FADE_TO_BLACK
setvar VAR_0x8004, 1
special Special_BattleRecords
special ShowBattleRecords
waitstate
releaseall
end
data/maps/TwoIsland_House/scripts.inc
+2 -2
View File
@@ -51,11 +51,11 @@ TwoIsland_House_EventScript_AskTutorMon:: @ 81716A5
TwoIsland_House_EventScript_ChooseMonToTutor:: @ 81716BE
msgbox TwoIsland_House_Text_TutorWhichMon
special Special_SelectMoveTutorMon
special SelectMoveTutorMon
waitstate
compare VAR_0x8004, PARTY_SIZE
goto_if_ge TwoIsland_House_EventScript_EndTutorMove
special Special_IsSelectedMonEgg
special IsSelectedMonEgg
compare VAR_RESULT, TRUE
goto_if_eq TwoIsland_House_EventScript_CantTutorEgg
compare VAR_0x8005, 0
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+1 -1
View File
@@ -40,7 +40,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: @ 8171435
textcolor 0
msgbox TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle
textcolor 1
special Special_BufferBigGuyOrBigGirlString
special BufferBigGuyOrBigGirlString
msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy
closemessage
applymovement LOCALID_LOSTELLE, Movement_WalkInPlaceFastestDown
data/maps/VermilionCity_Gym/scripts.inc
+2 -2
View File
@@ -45,7 +45,7 @@ VermilionCity_Gym_OnTransition:: @ 816B772
VermilionCity_Gym_EventScript_InitTrashCans:: @ 816B778
goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_Return
special Special_SetVermilionTrashCans
special SetVermilionTrashCans
copyvar VAR_TEMP_0, SWITCH1_ID
copyvar VAR_TEMP_1, SWITCH2_ID
return
@@ -168,7 +168,7 @@ VermilionCity_Gym_EventScript_TrySwitchTwo:: @ 816B89E
goto_if_eq VermilionCity_Gym_EventScript_FoundSwitchTwo
msgbox VermilionCity_Gym_Text_OnlyTrashLocksWereReset
clearflag FOUND_FIRST_SWITCH
special Special_SetVermilionTrashCans
special SetVermilionTrashCans
copyvar VAR_TEMP_0, SWITCH1_ID
copyvar VAR_TEMP_1, SWITCH2_ID
call VermilionCity_Gym_EventScript_SetBeamsOn
data/maps/ViridianCity/scripts.inc
+2 -2
View File
@@ -147,7 +147,7 @@ ViridianCity_EventScript_TutorialUnused:: @ 8165A65
msgbox ViridianCity_Text_ThatWasEducationalTakeThis
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special ScrSpecial_StartOldManTutorialBattle
special StartOldManTutorialBattle
waitstate
release
end
@@ -240,7 +240,7 @@ ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C
closemessage
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special ScrSpecial_StartOldManTutorialBattle
special StartOldManTutorialBattle
waitstate
lock
faceplayer