summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/cable_club.inc36
-rw-r--r--data/scripts/day_care.inc4
-rw-r--r--data/scripts/field_moves.inc16
-rw-r--r--data/scripts/move_tutors.inc4
-rw-r--r--data/scripts/pc.inc4
-rw-r--r--data/scripts/pkmn_center_nurse.inc6
-rw-r--r--data/scripts/pokedex_rating.inc4
-rw-r--r--data/scripts/seagallop.inc4
-rw-r--r--data/scripts/surf.inc4
-rw-r--r--data/scripts/trainer_battle.inc16
10 files changed, 25 insertions, 73 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index f51720a7f..c75ebdcfd 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -14,9 +14,7 @@ EventScript_HideMysteryGiftMan:: @ 81BB1CE
return
CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
execram
@@ -599,9 +597,7 @@ Movement_PlayerEnterMinigameRoom:: @ 81BB8A2
step_end
CableClub_EventScript_ShowBattleRecords:: @ 81BB8A7
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
lockall
fadescreen FADE_TO_BLACK
setvar VAR_0x8004, 0
@@ -774,9 +770,7 @@ CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC
end
CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
@@ -886,9 +880,7 @@ CableClub_EventScript_DontAskAboutLinking:: @ 81BBB92
return
CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
@@ -1149,9 +1141,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 81BBF88
end
CableClub_EventScript_81BBFD8:: @ 81BBFD8
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_NotReadyYet
specialvar VAR_RESULT, IsWirelessAdapterConnected
@@ -1200,9 +1190,7 @@ CableClub_OnResume:: @ 81BC05C
end
JoyfulGameCorner_EventScript_InfoMan2:: @ 81BC060
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
@@ -1232,9 +1220,7 @@ CableClub_EventScript_MinigameInfoExit:: @ 81BC0C4
end
JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
@@ -1371,9 +1357,7 @@ CableClub_EventScript_ExplainDodrioBerryPickingRequirements:: @ 81BC2DE
return
TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords:: @ 81BC2E7
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
lockall
special ShowPokemonJumpRecords
waitstate
@@ -1381,9 +1365,7 @@ TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords:: @ 81BC2E7
end
TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords:: @ 81BC2FC
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
lockall
special ShowDodrioBerryPickingRecords
waitstate
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index e96f52e20..9937bf704 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -1,7 +1,5 @@
Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
showmoneybox 0, 0, 0
diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc
index b5efb263a..73ee4d947 100644
--- a/data/scripts/field_moves.inc
+++ b/data/scripts/field_moves.inc
@@ -1,7 +1,5 @@
EventScript_InteractWithCutTreeObject:: @ 81BDF13
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_unset FLAG_BADGE02_GET, EventScript_CantCutTree
checkpartymove MOVE_CUT
@@ -61,9 +59,7 @@ Text_TreeCanBeCutDown:: @ 81BDFE3
.string "down!$"
EventScript_InteractWithRockSmashRockObject:: @ 81BE00C
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_unset FLAG_BADGE06_GET, EventScript_CantSmashRock
checkpartymove MOVE_ROCK_SMASH
@@ -126,9 +122,7 @@ Text_MonMaySmashRock:: @ 81BE0E2
.string "may be able to smash it.$"
EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_unset FLAG_BADGE04_GET, EventScript_CantMoveBoulder
goto_if_set FLAG_SYS_STRENGTH_ACTIVE, EventScript_AlreadyUsedStrength
@@ -189,9 +183,7 @@ Text_StrengthMadeMovingBouldersPossible:: @ 81BE284
.string "boulders around.$"
EventScript_InteractWithWaterfall:: @ 81BE2B7
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
lockall
checkpartymove MOVE_WATERFALL
compare VAR_RESULT, PARTY_SIZE
diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc
index 702889e5d..40fcd43db 100644
--- a/data/scripts/move_tutors.inc
+++ b/data/scripts/move_tutors.inc
@@ -447,9 +447,7 @@ EventScript_BodySlamTaught:: @ 81C4DE2
end
TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc
index ff61d2e2e..6e266bdfc 100644
--- a/data/scripts/pc.inc
+++ b/data/scripts/pc.inc
@@ -1,7 +1,5 @@
EventScript_PC:: @ 81A6955
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_set FLAG_SYS_PC_STORAGE_DISABLED, EventScript_PCDisabled
setvar VAR_0x8004, 27
diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc
index cfa96774d..fddd3fd72 100644
--- a/data/scripts/pkmn_center_nurse.inc
+++ b/data/scripts/pkmn_center_nurse.inc
@@ -1,7 +1,5 @@
EventScript_PkmnCenterNurse:: @ 81A6578
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
message Text_WelcomeWantToHealPkmn
waitmessage
multichoice 19, 8, MULTICHOICE_YES_NO, FALSE | (TRUE << 1)
@@ -16,7 +14,7 @@ EventScript_PkmnCenterNurse_HealPkmn:: @ 81A65B8
message Text_TakeYourPkmnForFewSeconds
waitmessage
call EventScript_PkmnCenterNurse_TakeAndHealPkmn
- special sub_80CC524
+ special SetUsedPkmnCenterQuestLogEvent
goto EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom
end
diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc
index c9d836aee..4a3d39042 100644
--- a/data/scripts/pokedex_rating.inc
+++ b/data/scripts/pokedex_rating.inc
@@ -1,7 +1,5 @@
ProfOak_EventScript_RatePokedexInPerson:: @ 81A737B
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
call_if_set FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_DexCompleteIntro
call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_NormalIntro
diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc
index c14cda778..77ed21b7a 100644
--- a/data/scripts/seagallop.inc
+++ b/data/scripts/seagallop.inc
@@ -109,9 +109,7 @@ EventScript_1A90CC:: @ 81A90CC
EventScript_1A90DA:: @ 81A90DA
closemessage
delay 20
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A7AE0
+ goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
fadescreen FADE_TO_BLACK
special ScrSpecial_SeagallopFerry
diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc
index 456cad9e9..e1d44968b 100644
--- a/data/scripts/surf.inc
+++ b/data/scripts/surf.inc
@@ -1,7 +1,5 @@
EventScript_UseSurf:: @ 81A6AC8
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_UseSurfEnd
+ goto_if_questlog EventScript_UseSurfEnd
checkpartymove MOVE_SURF
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_UseSurfEnd
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc
index f16e30ada..ccb279300 100644
--- a/data/scripts/trainer_battle.inc
+++ b/data/scripts/trainer_battle.inc
@@ -48,9 +48,7 @@ EventScript_DoTrainerBattle:: @ 81A4F21
applymovement VAR_LAST_TALKED, Movement_1A4FC5
waitmovement 0
special PlayTrainerEncounterMusic
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A501A
+ goto_if_questlog EventScript_1A501A
battlebegin
ontrainerbattleend
@@ -64,9 +62,7 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E
special ScrSpecial_ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A4FB8
+ goto_if_questlog EventScript_1A4FB8
special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
@@ -87,9 +83,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
special ScrSpecial_ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A4FB8
+ goto_if_questlog EventScript_1A4FB8
special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
@@ -122,9 +116,7 @@ EventScript_1A4FC7:: @ 81A4FC7
special ScrSpecial_ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
- special sub_8110AB4
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A501A
+ goto_if_questlog EventScript_1A501A
battlebegin
specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode
compare VAR_RESULT, 0
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-12 10:57:35 +0000