summaryrefslogtreecommitdiff
path: root/data-de
diff options
context:
space:
mode:
Diffstat (limited to 'data-de')
-rw-r--r--data-de/event_scripts.s140
-rw-r--r--data-de/field_move_scripts.inc24
2 files changed, 82 insertions, 82 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index b8cc5d8f6..020c9a97d 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -440,8 +440,8 @@ EventScript_15F3E2:
end
EventScript_15F419:
- msgbox UnknownString_81A38FB, 5
- compare RESULT, 0
+ msgbox UnknownString_81A38FB, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq EventScript_15F384
closemessage
special SecretBasePC_PackUp
@@ -492,8 +492,8 @@ EventScript_15F4A1:
compare RESULT, 2
goto_if_eq EventScript_15F503
special BufferSecretBaseOwnerName
- msgbox UnknownString_81A3958, 5
- compare RESULT, 0
+ msgbox UnknownString_81A3958, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq EventScript_15F452
msgbox UnknownString_81A3A22, 3
special sub_80BC5BC
@@ -502,8 +502,8 @@ EventScript_15F4A1:
end
EventScript_15F4E0:
- msgbox UnknownString_81A3982, 5
- compare RESULT, 0
+ msgbox UnknownString_81A3982, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq EventScript_15F452
msgbox UnknownString_81A3A3A, 3
special sub_80BC5BC
@@ -1449,10 +1449,10 @@ SootopolisCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
lock
faceplayer
- msgbox gText_NurseJoy_Welcome, 5
- compare RESULT, 1
+ msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO
+ compare RESULT, YES
goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FD7C
- compare RESULT, 0
+ compare RESULT, NO
goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDC7
end
@@ -1670,10 +1670,10 @@ HiddenItemScript_Fail:
UnusedMixRecordsScript: @ 819FFD5
lock
faceplayer
- msgbox UnusedMixRecordsPromptText, 5
- compare RESULT, 1
+ msgbox UnusedMixRecordsPromptText, MSGBOX_YESNO
+ compare RESULT, YES
goto_if_eq UnusedMixRecordsScript_Yes
- compare RESULT, 0
+ compare RESULT, NO
goto_if_eq UnusedMixRecordsScript_Done
goto UnusedMixRecordsScript_Done
UnusedMixRecordsScript_Yes: @ 819FFFA
@@ -1833,8 +1833,8 @@ UseSurfScript:: @ 81A0117
bufferpartymonnick 0, RESULT
setfieldeffectargument 0, RESULT
lockall
- msgbox UseSurfPromptText, 5
- compare RESULT, 0
+ msgbox UseSurfPromptText, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq UseSurfScript_No
msgbox UsedSurfText, 4
dofieldeffect 9
@@ -2199,8 +2199,8 @@ Route101_EventScript_1A037F:: @ 81A037F
Route103_EventScript_1A037F:: @ 81A037F
lock
faceplayer
- msgbox Route101_Text_1C4449, 5
- compare RESULT, 0
+ msgbox Route101_Text_1C4449, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq Route101_EventScript_1A039B
call Route101_EventScript_1A03B0
release
@@ -2448,8 +2448,8 @@ Route120_EventScript_1A0594:: @ 81A0594
end
Route119_EventScript_1A05AE:: @ 81A05AE
- msgbox Route119_Text_171BB6, 5
- compare RESULT, 1
+ msgbox Route119_Text_171BB6, MSGBOX_YESNO
+ compare RESULT, YES
goto_if_eq Route119_EventScript_1A05C3
release
end
@@ -3653,8 +3653,8 @@ EventScript_1A2CB0:
compare RESULT, 6
goto_if_eq EventScript_1A2CF1
bufferpartymonnick 0, RESULT
- msgbox UnknownString_8198F34, 5
- compare RESULT, 0
+ msgbox UnknownString_8198F34, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq EventScript_1A2F3A
msgbox UsedCutRockSmashText, 4
closemessage
@@ -3684,8 +3684,8 @@ EventScript_1A2D08:
compare RESULT, 6
goto_if_eq EventScript_1A2D49
bufferpartymonnick 0, RESULT
- msgbox UnknownString_81A197B, 5
- compare RESULT, 0
+ msgbox UnknownString_81A197B, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq EventScript_1A2F3A
msgbox UsedCutRockSmashText, 4
closemessage
@@ -3715,8 +3715,8 @@ EventScript_1A2D60:
compare RESULT, 6
goto_if_eq EventScript_1A2DA1
bufferpartymonnick 0, RESULT
- msgbox UnknownString_81A1A4B, 5
- compare RESULT, 0
+ msgbox UnknownString_81A1A4B, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq EventScript_1A2F3A
msgbox UsedCutRockSmashText, 4
closemessage
@@ -3759,8 +3759,8 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE
applymovement 255, SecretBase_RedCave1_Movement_1A2E11
waitmovement 0
setvar VAR_0x4097, 1
- msgbox SecretBase_RedCave1_Text_198F89, 5
- compare RESULT, 1
+ msgbox SecretBase_RedCave1_Text_198F89, MSGBOX_YESNO
+ compare RESULT, YES
goto_if_eq SecretBase_RedCave1_EventScript_1A2E08
closemessage
playse SE_KAIDAN
@@ -3807,18 +3807,18 @@ EventScript_1A2E45:
setorcopyvar VAR_SPECIAL_4, RESULT
lockall
special GetSecretBaseNearbyMapName
- msgbox UnknownString_81A3C71, 5
- compare RESULT, 0
+ msgbox UnknownString_81A3C71, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq EventScript_1A2F3A
- msgbox UnknownString_81A38FB, 5
- compare RESULT, 0
+ msgbox UnknownString_81A38FB, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq EventScript_1A2F3A
fadescreen 1
special MoveSecretBase
closemessage
fadescreen 0
- msgbox UnknownString_81A3CC9, 5
- compare RESULT, 0
+ msgbox UnknownString_81A3CC9, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq EventScript_1A2F3A
bufferpartymonnick 0, VAR_SPECIAL_4
buffermovename 1, MOVE_SECRET_POWER
@@ -3971,8 +3971,8 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
goto_if_eq SecretBase_RedCave1_EventScript_1A30A5
lock
faceplayer
- msgbox SecretBase_RedCave1_Text_1A1AEA, 5
- compare RESULT, 0
+ msgbox SecretBase_RedCave1_Text_1A1AEA, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq SecretBase_RedCave1_EventScript_1A308F
setvar RESULT, 1
special sub_80BCE4C
@@ -4006,8 +4006,8 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
goto_if_eq SecretBase_RedCave1_EventScript_1A3121
lock
faceplayer
- msgbox SecretBase_RedCave1_Text_1A1E67, 5
- compare RESULT, 0
+ msgbox SecretBase_RedCave1_Text_1A1E67, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq SecretBase_RedCave1_EventScript_1A310B
setvar RESULT, 1
special sub_80BCE4C
@@ -4041,8 +4041,8 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
goto_if_eq SecretBase_RedCave1_EventScript_1A319D
lock
faceplayer
- msgbox SecretBase_RedCave1_Text_1A218F, 5
- compare RESULT, 0
+ msgbox SecretBase_RedCave1_Text_1A218F, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq SecretBase_RedCave1_EventScript_1A3187
setvar RESULT, 1
special sub_80BCE4C
@@ -4076,8 +4076,8 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
goto_if_eq SecretBase_RedCave1_EventScript_1A3219
lock
faceplayer
- msgbox SecretBase_RedCave1_Text_1A24E1, 5
- compare RESULT, 0
+ msgbox SecretBase_RedCave1_Text_1A24E1, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq SecretBase_RedCave1_EventScript_1A3203
setvar RESULT, 1
special sub_80BCE4C
@@ -4111,8 +4111,8 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
goto_if_eq SecretBase_RedCave1_EventScript_1A3295
lock
faceplayer
- msgbox SecretBase_RedCave1_Text_1A2830, 5
- compare RESULT, 0
+ msgbox SecretBase_RedCave1_Text_1A2830, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq SecretBase_RedCave1_EventScript_1A327F
setvar RESULT, 1
special sub_80BCE4C
@@ -4146,8 +4146,8 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
goto_if_eq SecretBase_RedCave1_EventScript_1A3311
lock
faceplayer
- msgbox SecretBase_RedCave1_Text_1A1CB2, 5
- compare RESULT, 0
+ msgbox SecretBase_RedCave1_Text_1A1CB2, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq SecretBase_RedCave1_EventScript_1A32FB
setvar RESULT, 1
special sub_80BCE4C
@@ -4181,8 +4181,8 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
goto_if_eq SecretBase_RedCave1_EventScript_1A338D
lock
faceplayer
- msgbox SecretBase_RedCave1_Text_1A2026, 5
- compare RESULT, 0
+ msgbox SecretBase_RedCave1_Text_1A2026, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq SecretBase_RedCave1_EventScript_1A3377
setvar RESULT, 1
special sub_80BCE4C
@@ -4216,8 +4216,8 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
goto_if_eq SecretBase_RedCave1_EventScript_1A3409
lock
faceplayer
- msgbox SecretBase_RedCave1_Text_1A236A, 5
- compare RESULT, 0
+ msgbox SecretBase_RedCave1_Text_1A236A, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq SecretBase_RedCave1_EventScript_1A33F3
setvar RESULT, 1
special sub_80BCE4C
@@ -4251,8 +4251,8 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
goto_if_eq SecretBase_RedCave1_EventScript_1A3485
lock
faceplayer
- msgbox SecretBase_RedCave1_Text_1A2663, 5
- compare RESULT, 0
+ msgbox SecretBase_RedCave1_Text_1A2663, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq SecretBase_RedCave1_EventScript_1A346F
setvar RESULT, 1
special sub_80BCE4C
@@ -4286,8 +4286,8 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
goto_if_eq SecretBase_RedCave1_EventScript_1A3501
lock
faceplayer
- msgbox SecretBase_RedCave1_Text_1A2A13, 5
- compare RESULT, 0
+ msgbox SecretBase_RedCave1_Text_1A2A13, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq SecretBase_RedCave1_EventScript_1A34EB
setvar RESULT, 1
special sub_80BCE4C
@@ -4427,10 +4427,10 @@ SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D
compare RESULT, 1
goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6
copyvar VAR_SPECIAL_9, VAR_SPECIAL_6
- msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5
- compare RESULT, 1
+ msgbox SlateportCity_PokemonFanClub_Text_1A8704, MSGBOX_YESNO
+ compare RESULT, YES
goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84
- compare RESULT, 0
+ compare RESULT, NO
goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9
end
@@ -4475,18 +4475,18 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0
checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25
setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER
- msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5
- compare RESULT, 1
+ msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, MSGBOX_YESNO
+ compare RESULT, YES
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44
- compare RESULT, 0
+ compare RESULT, NO
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79
end
SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25
- msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, 5
- compare RESULT, 1
+ msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, MSGBOX_YESNO
+ compare RESULT, YES
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44
- compare RESULT, 0
+ compare RESULT, NO
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79
end
@@ -4531,10 +4531,10 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0
compare RESULT, 1
goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC
copyvar VAR_SPECIAL_9, VAR_SPECIAL_6
- msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5
- compare RESULT, 1
+ msgbox SlateportCity_PokemonFanClub_Text_1A82F1, MSGBOX_YESNO
+ compare RESULT, YES
goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9
- compare RESULT, 0
+ compare RESULT, NO
goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2
end
@@ -4608,10 +4608,10 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6
compare RESULT, 1
goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E
copyvar VAR_SPECIAL_9, VAR_SPECIAL_6
- msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5
- compare RESULT, 1
+ msgbox FallarborTown_ContestLobby_Text_1A6F7C, MSGBOX_YESNO
+ compare RESULT, YES
goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8
- compare RESULT, 0
+ compare RESULT, NO
goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D
end
@@ -4705,10 +4705,10 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF
compare RESULT, 1
goto_if_eq BattleTower_Lobby_EventScript_1AE2E3
copyvar VAR_SPECIAL_9, VAR_SPECIAL_6
- msgbox BattleTower_Lobby_Text_1A776D, 5
- compare RESULT, 1
+ msgbox BattleTower_Lobby_Text_1A776D, MSGBOX_YESNO
+ compare RESULT, YES
goto_if_eq BattleTower_Lobby_EventScript_1AE241
- compare RESULT, 0
+ compare RESULT, NO
goto_if_eq BattleTower_Lobby_EventScript_1AE297
end
diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc
index edecb0312..91f6ca620 100644
--- a/data-de/field_move_scripts.inc
+++ b/data-de/field_move_scripts.inc
@@ -8,8 +8,8 @@ S_CuttableTree:: @ 81B0DCC
setfieldeffectargument 0, RESULT
bufferpartymonnick 0, RESULT
buffermovename 1, MOVE_CUT
- msgbox UseCutPromptText, 5
- compare RESULT, 0
+ msgbox UseCutPromptText, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq Cut_ChoseNo
msgbox UsedCutRockSmashText, 4
closemessage
@@ -69,8 +69,8 @@ S_BreakableRock:: @ 81B0EB7
setfieldeffectargument 0, RESULT
bufferpartymonnick 0, RESULT
buffermovename 1, MOVE_ROCK_SMASH
- msgbox UseRockSmashPromptText, 5
- compare RESULT, 0
+ msgbox UseRockSmashPromptText, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq RockSmash_ChoseNo
msgbox UsedCutRockSmashText, 4
closemessage
@@ -136,8 +136,8 @@ S_PushableBoulder:: @ 81B0FCB
compare RESULT, 6
goto_if_eq CannotUseStrength
setfieldeffectargument 0, RESULT
- msgbox UseStrengthPromptText, 5
- compare RESULT, 0
+ msgbox UseStrengthPromptText, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq Strength_ChoseNo
closemessage
dofieldeffect 40
@@ -198,8 +198,8 @@ S_UseWaterfall:: @ 81B115A
goto_if_eq Waterfall_NoMonKnows
bufferpartymonnick 0, RESULT
setfieldeffectargument 0, RESULT
- msgbox UseWaterfallPromptText, 5
- compare RESULT, 0
+ msgbox UseWaterfallPromptText, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq Waterfall_Done
msgbox UsedWaterfallText, 4
dofieldeffect 43
@@ -232,8 +232,8 @@ UseDiveScript:: @ 81B1220
bufferpartymonnick 0, RESULT
setfieldeffectargument 0, RESULT
setfieldeffectargument 1, 1
- msgbox UseDivePromptText, 5
- compare RESULT, 0
+ msgbox UseDivePromptText, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq Dive_Done
msgbox UsedDiveText, 4
dofieldeffect 44
@@ -255,8 +255,8 @@ S_UseDiveUnderwater:: @ 81B1269
bufferpartymonnick 0, RESULT
setfieldeffectargument 0, RESULT
setfieldeffectargument 1, 1
- msgbox UnderwaterUseDivePromptText, 5
- compare RESULT, 0
+ msgbox UnderwaterUseDivePromptText, MSGBOX_YESNO
+ compare RESULT, NO
goto_if_eq UnderwaterDive_Done
msgbox UsedDiveText, 4
dofieldeffect 44
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 12:46:23 +0000