Merge branch 'master' into battle_anim

2 files changed, 108 insertions, 107 deletions

diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index e786a6ab1..020c9a97d 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -8,6 +8,7 @@
 #include "constants/opponents.h"
 #include "constants/songs.h"
 #include "constants/species.h"
+#include "constants/weather.h"
 #include "constants/vars.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
@@ -396,13 +397,13 @@ gStdScripts_End::
 
 gUnknown_0815F36C:: @ 815F36C
 	lockall
-	playse 2
+	playse SE_PC_LOGON
 	message UnknownString_81A3A72
 	dofieldeffect 61
 	waitstate
 	waitmessage
 	waitbuttonpress
-	playse 5
+	playse SE_SELECT
 	goto EventScript_15F384
 	end
 
@@ -439,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
@@ -458,12 +459,12 @@ EventScript_15F436:
 gUnknown_0815F43A:: @ 815F43A
 	lockall
 	message UnknownString_81A3A72
-	playse 2
+	playse SE_PC_LOGON
 	dofieldeffect 61
 	waitstate
 	waitmessage
 	waitbuttonpress
-	playse 5
+	playse SE_SELECT
 	goto EventScript_15F452
 	end
 
@@ -491,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
@@ -501,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
@@ -1448,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
 
@@ -1572,11 +1573,11 @@ Std_ObtainItem_Fail: @ 819FECC
 	return
 
 PlayGetItemFanfare:
-	playfanfare 0x172
+	playfanfare BGM_FANFA4
 	return
 
 PlayGetTMHMFanfare:
-	playfanfare 0x174
+	playfanfare BGM_ME_WAZA
 	return
 
 Std_ObtainDecoration: @ 819FEDA
@@ -1594,7 +1595,7 @@ Std_ObtainDecoration_: @ 819FEE8
 	return
 
 Std_ObtainDecoration_Success: @ 819FF03
-	playfanfare 0x172
+	playfanfare BGM_FANFA4
 	message Message_ObtainedDecoration
 	waitfanfare
 	waitmessage
@@ -1669,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
@@ -1691,7 +1692,7 @@ gUnknown_081A0009:: @ 81A0009
 	lockall
 	setvar VAR_SPECIAL_4, 0
 	special DoPCTurnOnEffect
-	playse 4
+	playse SE_PC_ON
 	msgbox UnknownString_81A09EC, 4
 	goto EventScript_1A0023
 	end
@@ -1714,7 +1715,7 @@ EventScript_1A0033:
 	end
 
 EventScript_1A0070:
-	playse 2
+	playse SE_PC_LOGON
 	msgbox UnknownString_81A0A54, 4
 	special PlayerPC
 	waitstate
@@ -1722,7 +1723,7 @@ EventScript_1A0070:
 	end
 
 EventScript_1A0085:
-	playse 2
+	playse SE_PC_LOGON
 	checkflag FLAG_SYS_PC_LANETTE
 	call_if 0, EventScript_1A00AC
 	checkflag FLAG_SYS_PC_LANETTE
@@ -1743,7 +1744,7 @@ EventScript_1A00B5:
 
 EventScript_1A00BE:
 	setvar VAR_SPECIAL_4, 0
-	playse 3
+	playse SE_PC_OFF
 	special DoPCTurnOffEffect
 	releaseall
 	end
@@ -1751,7 +1752,7 @@ EventScript_1A00BE:
 EventScript_1A00CB:
 	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, EventScript_1A00BE
-	playse 2
+	playse SE_PC_LOGON
 	special AccessHallOfFamePC
 	waitstate
 	goto EventScript_1A0033
@@ -1832,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
@@ -2096,9 +2097,9 @@ Route127_EventScript_1A02C1:: @ 81A02C1
 Route128_EventScript_1A02C1:: @ 81A02C1
 SootopolisCity_EventScript_1A02C1:: @ 81A02C1
 	.ifdef SAPPHIRE
-	setweather 13
+	setweather WEATHER_RAIN_HEAVY
 	.else
-	setweather 12
+	setweather WEATHER_DROUGHT
 	.endif
 	return
 
@@ -2111,7 +2112,7 @@ MossdeepCity_Gym_EventScript_1A02C5:: @ 81A02C5
 PetalburgCity_Gym_EventScript_1A02C5:: @ 81A02C5
 RustboroCity_Gym_EventScript_1A02C5:: @ 81A02C5
 SootopolisCity_Gym_1F_EventScript_1A02C5:: @ 81A02C5
-	playfanfare 369
+	playfanfare BGM_ME_BACHI
 	waitfanfare
 	return
 
@@ -2120,7 +2121,7 @@ Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA
 Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA
 SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
 	fadescreen 1
-	playfanfare 368
+	playfanfare BGM_ME_ASA
 	waitfanfare
 	special ScrSpecial_HealPlayerParty
 	fadescreen 0
@@ -2139,7 +2140,7 @@ DewfordTown_EventScript_1A02E7:: @ 81A02E7
 Route104_EventScript_1A02E7:: @ 81A02E7
 Route109_EventScript_1A02E7:: @ 81A02E7
 	setflag FLAG_SPECIAL_FLAG_1
-	playbgm 431, 0
+	playbgm BGM_M_BOAT, FALSE
 	return
 
 DewfordTown_EventScript_1A02EF:: @ 81A02EF
@@ -2198,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
@@ -2447,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
@@ -2553,7 +2554,7 @@ GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F
 MtPyre_Summit_EventScript_1A067F:: @ 81A067F
 SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F
 	bufferitemname 0, VAR_SPECIAL_4
-	playfanfare 372
+	playfanfare BGM_ME_WAZA
 	message FallarborTown_House1_Text_1A1498
 	waitmessage
 	waitfanfare
@@ -2566,7 +2567,7 @@ EverGrandeCity_PhoebesRoom_EventScript_1A0693:: @ 81A0693
 EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693
 	applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853
 	waitmovement 0
-	playse 8
+	playse SE_DOOR
 	setmetatile 6, 1, 836, 0
 	setmetatile 6, 2, 837, 0
 	setmetatile 0, 2, 734, 1
@@ -2588,7 +2589,7 @@ EverGrandeCity_PhoebesRoom_EventScript_1A0710:: @ 81A0710
 EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710
 	applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847
 	waitmovement 0
-	playse 52
+	playse SE_TRACK_DOOR
 	setmetatile 5, 12, 518, 1
 	setmetatile 6, 12, 518, 1
 	setmetatile 7, 12, 518, 1
@@ -3652,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
@@ -3683,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
@@ -3714,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
@@ -3742,7 +3743,7 @@ EventScript_1A2DAA:
 
 EventScript_1A2DB8:
 	closemessage
-	playse 9
+	playse SE_KAIDAN
 	setvar VAR_0x4097, 0
 	setflag FLAG_DECORATION_1
 	special sub_80BB8CC
@@ -3758,11 +3759,11 @@ 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 9
+	playse SE_KAIDAN
 	special sub_80BC440
 	end
 
@@ -3781,7 +3782,7 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11
 gUnknown_081A2E14:: @ 81A2E14
 	lockall
 	setvar VAR_0x4097, 1
-	playse 9
+	playse SE_KAIDAN
 	special sub_80BC114
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2E38
@@ -3806,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
@@ -3970,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
@@ -4005,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
@@ -4040,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
@@ -4075,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
@@ -4110,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
@@ -4145,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
@@ -4180,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
@@ -4215,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
@@ -4250,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
@@ -4285,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
@@ -4426,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
 
@@ -4474,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
 
@@ -4530,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
 
@@ -4607,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
 
@@ -4704,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
 
@@ -4915,7 +4916,7 @@ S_FallDownHole:: @ 81C6BC5
 	delay 20
 	applymovement 255, GraniteCave_B1F_Movement_1C6BF7
 	waitmovement 0
-	playse 43
+	playse SE_RU_HYUU
 	delay 60
 	warphole MAP_UNDEFINED
 	waitstate
@@ -4926,7 +4927,7 @@ gUnknown_081C6BDE:: @ 81C6BDE
 	delay 20
 	applymovement 255, GraniteCave_B1F_Movement_1C6BF7
 	waitmovement 0
-	playse 43
+	playse SE_RU_HYUU
 	delay 60
 	special sp13F_fall_to_last_warp
 	waitstate
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