summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/apprentice.inc2
-rw-r--r--data/scripts/berry_tree.inc6
-rw-r--r--data/scripts/cable_club.inc118
-rw-r--r--data/scripts/contest_hall.inc74
-rw-r--r--data/scripts/day_care.inc70
-rw-r--r--data/scripts/field_move_scripts.inc40
-rw-r--r--data/scripts/gabby_and_ty.inc112
-rw-r--r--data/scripts/mauville_man.inc72
-rw-r--r--data/scripts/mystery_event_club.inc24
-rw-r--r--data/scripts/players_house.inc72
-rw-r--r--data/scripts/pokeblocks.inc114
-rw-r--r--data/scripts/safari_zone.inc4
-rw-r--r--data/scripts/secret_power_tm.inc10
-rw-r--r--data/scripts/tv.inc8
14 files changed, 363 insertions, 363 deletions
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc
index a644008d0..bbb7662ba 100644
--- a/data/scripts/apprentice.inc
+++ b/data/scripts/apprentice.inc
@@ -289,7 +289,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
end
Script_Apprentice_SetLeavingFlags:
- setflag FLAG_0x2BD
+ setflag FLAG_HIDE_APPRENTICE
setflag FLAG_0x934
return
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 1fda1133f..21ab4256c 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -31,7 +31,7 @@ Route102_EventScript_274359:: @ 8274359
end
Route102_EventScript_274374:: @ 8274374
- msgbox Route102_Text_274507, 5
+ msgbox Route102_Text_274507, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route102_EventScript_274393
compare VAR_RESULT, 0
@@ -106,7 +106,7 @@ Route102_EventScript_274421:: @ 8274421
lock
faceplayer
special EventObjectInteractionGetBerryCountString
- msgbox Route102_Text_2745EE, 5
+ msgbox Route102_Text_2745EE, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route102_EventScript_274448
compare VAR_RESULT, 0
@@ -155,7 +155,7 @@ Route102_EventScript_27448D:: @ 827448D
compare VAR_RESULT, 0
goto_eq Route102_EventScript_2744BE
special EventObjectInteractionGetBerryName
- msgbox Route102_Text_2746E4, 5
+ msgbox Route102_Text_2746E4, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route102_EventScript_2744C4
compare VAR_RESULT, 0
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index ce3dea170..c92c14763 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -29,11 +29,11 @@ OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5
end
OldaleTown_PokemonCenter_2F_EventScript_276AFB:: @ 8276AFB
- clearflag FLAG_0x2BE
+ clearflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
return
OldaleTown_PokemonCenter_2F_EventScript_276AFF:: @ 8276AFF
- setflag FLAG_0x2BE
+ setflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
return
BattleFrontier_PokemonCenter_2F_EventScript_276B03:: @ 8276B03
@@ -63,7 +63,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B19:: @ 8276B19
execram
OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A
- msgbox gUnknown_08273178, 2
+ msgbox gUnknown_08273178, MSGBOX_NPC
end
OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23
@@ -72,16 +72,16 @@ OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23
goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B19
checkflag FLAG_SYS_HAS_EON_TICKET
goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B19
- msgbox gUnknown_08273594, 4
+ msgbox gUnknown_08273594, MSGBOX_DEFAULT
giveitem_std ITEM_EON_TICKET
setflag FLAG_SYS_HAS_EON_TICKET
setvar VAR_0x403F, 0
- msgbox gUnknown_082735F2, 4
+ msgbox gUnknown_082735F2, MSGBOX_DEFAULT
release
end
OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62
- msgbox gUnknown_08273178, 4
+ msgbox gUnknown_08273178, MSGBOX_DEFAULT
release
end
@@ -331,12 +331,12 @@ OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0
lockall
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_2725A6
waitmovement 0
- msgbox OldaleTown_PokemonCenter_2F_Text_27964A, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT
closemessage
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_276E10
waitmovement 0
delay 30
- msgbox OldaleTown_PokemonCenter_2F_Text_279718, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT
setvar VAR_0x40CD, 2
releaseall
end
@@ -354,7 +354,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276E13:: @ 8276E13
end
OldaleTown_PokemonCenter_2F_EventScript_276E22:: @ 8276E22
- msgbox OldaleTown_PokemonCenter_2F_Text_277EF1, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_277EF1, MSGBOX_DEFAULT
goto OldaleTown_PokemonCenter_2F_EventScript_276E30
end
@@ -399,7 +399,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276EC2:: @ 8276EC2
end
OldaleTown_PokemonCenter_2F_EventScript_276F15:: @ 8276F15
- msgbox OldaleTown_PokemonCenter_2F_Text_279142, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_279142, MSGBOX_DEFAULT
goto OldaleTown_PokemonCenter_2F_EventScript_276EC2
end
@@ -417,7 +417,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E
end
OldaleTown_PokemonCenter_2F_EventScript_276F47:: @ 8276F47
- msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, MSGBOX_DEFAULT
goto OldaleTown_PokemonCenter_2F_EventScript_276EC2
end
@@ -502,25 +502,25 @@ OldaleTown_PokemonCenter_2F_EventScript_277046:: @ 8277046
OldaleTown_PokemonCenter_2F_EventScript_277072:: @ 8277072
special CloseLink
- msgbox OldaleTown_PokemonCenter_2F_Text_27833D, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_27833D, MSGBOX_DEFAULT
goto OldaleTown_PokemonCenter_2F_EventScript_2770A5
end
OldaleTown_PokemonCenter_2F_EventScript_277083:: @ 8277083
special CloseLink
- msgbox OldaleTown_PokemonCenter_2F_Text_278307, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_278307, MSGBOX_DEFAULT
goto OldaleTown_PokemonCenter_2F_EventScript_2770A5
end
OldaleTown_PokemonCenter_2F_EventScript_277094:: @ 8277094
special CloseLink
- msgbox OldaleTown_PokemonCenter_2F_Text_2782D1, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_2782D1, MSGBOX_DEFAULT
goto OldaleTown_PokemonCenter_2F_EventScript_2770A5
end
OldaleTown_PokemonCenter_2F_EventScript_2770A5:: @ 82770A5
special CloseLink
- msgbox OldaleTown_PokemonCenter_2F_Text_278372, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_278372, MSGBOX_DEFAULT
release
end
@@ -593,12 +593,12 @@ OldaleTown_PokemonCenter_2F_EventScript_277199:: @ 8277199
return
OldaleTown_PokemonCenter_2F_EventScript_2771BF:: @ 82771BF
- msgbox OldaleTown_PokemonCenter_2F_Text_278027, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_278027, MSGBOX_DEFAULT
setvar VAR_RESULT, 0
return
OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD
- msgbox OldaleTown_PokemonCenter_2F_Text_278061, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_278061, MSGBOX_DEFAULT
setvar VAR_RESULT, 0
return
@@ -659,45 +659,45 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C
OldaleTown_PokemonCenter_2F_EventScript_2772AB:: @ 82772AB
special CloseLink
- msgbox OldaleTown_PokemonCenter_2F_Text_278565, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_278565, MSGBOX_DEFAULT
release
end
OldaleTown_PokemonCenter_2F_EventScript_2772B8:: @ 82772B8
special CloseLink
- msgbox OldaleTown_PokemonCenter_2F_Text_2785C9, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_2785C9, MSGBOX_DEFAULT
release
end
BattleFrontier_BattleTowerLobby_EventScript_2772C5:: @ 82772C5
OldaleTown_PokemonCenter_2F_EventScript_2772C5:: @ 82772C5
special CloseLink
- msgbox OldaleTown_PokemonCenter_2F_Text_27821C, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_27821C, MSGBOX_DEFAULT
release
end
BattleFrontier_BattleTowerLobby_EventScript_2772D2:: @ 82772D2
OldaleTown_PokemonCenter_2F_EventScript_2772D2:: @ 82772D2
special CloseLink
- msgbox OldaleTown_PokemonCenter_2F_Text_2781C7, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_2781C7, MSGBOX_DEFAULT
release
end
OldaleTown_PokemonCenter_2F_EventScript_2772DF:: @ 82772DF
special CloseLink
- msgbox OldaleTown_PokemonCenter_2F_Text_278255, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_278255, MSGBOX_DEFAULT
release
end
OldaleTown_PokemonCenter_2F_EventScript_2772EC:: @ 82772EC
special CloseLink
- msgbox OldaleTown_PokemonCenter_2F_Text_278291, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_278291, MSGBOX_DEFAULT
release
end
MossdeepCity_GameCorner_1F_EventScript_2772F9:: @ 82772F9
special CloseLink
- msgbox MossdeepCity_GameCorner_1F_Text_278D51, 4
+ msgbox MossdeepCity_GameCorner_1F_Text_278D51, MSGBOX_DEFAULT
release
end
@@ -709,29 +709,29 @@ OldaleTown_PokemonCenter_2F_EventScript_277306:: @ 8277306
OldaleTown_PokemonCenter_2F_EventScript_27730E:: @ 827730E
special CloseLink
- msgbox OldaleTown_PokemonCenter_2F_Text_2782A8, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_2782A8, MSGBOX_DEFAULT
release
end
OldaleTown_PokemonCenter_2F_EventScript_27731B:: @ 827731B
special CloseLink
- msgbox OldaleTown_PokemonCenter_2F_Text_2785E9, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_2785E9, MSGBOX_DEFAULT
release
end
OldaleTown_PokemonCenter_2F_EventScript_277328:: @ 8277328
special CloseLink
- msgbox OldaleTown_PokemonCenter_2F_Text_278651, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_278651, MSGBOX_DEFAULT
release
end
OldaleTown_PokemonCenter_2F_EventScript_277335:: @ 8277335
- msgbox gUnknown_0827306F, 4
+ msgbox gUnknown_0827306F, MSGBOX_DEFAULT
release
end
OldaleTown_PokemonCenter_2F_EventScript_27733F:: @ 827733F
- msgbox gUnknown_082730BC, 4
+ msgbox gUnknown_082730BC, MSGBOX_DEFAULT
releaseall
end
@@ -917,34 +917,34 @@ RecordCorner_EventScript_277471:: @ 8277471
end
EventScript_TradeRoom_ReadTrainerCard1:: @ 827747E
- msgbox Text_278452, 4
+ msgbox Text_278452, MSGBOX_DEFAULT
fadescreen 1
special sp02A_crash_sound
waitstate
end
EventScript_TradeRoom_ReadTrainerCard2:: @ 827748D
- msgbox Text_27847B, 4
+ msgbox Text_27847B, MSGBOX_DEFAULT
fadescreen 1
special sp02A_crash_sound
waitstate
end
EventScript_TradeRoom_TooBusyToNotice:: @ 827749C
- msgbox Text_27842E, 4
+ msgbox Text_27842E, MSGBOX_DEFAULT
closemessage
end
SingleBattleColosseum_EventScript_2774A6:: @ 82774A6
special sub_8098574
- msgbox SingleBattleColosseum_Text_2784B4, 4
+ msgbox SingleBattleColosseum_Text_2784B4, MSGBOX_DEFAULT
special sub_809859C
closemessage
end
TradeCenter_EventScript_2774B6:: @ 82774B6
special sub_8098574
- msgbox TradeCenter_Text_2784E2, 4
+ msgbox TradeCenter_Text_2784E2, MSGBOX_DEFAULT
special sub_809859C
closemessage
end
@@ -970,7 +970,7 @@ RecordCorner_EventScript_2774E0:: @ 82774E0
end
gUnknown_082774EF:: @ 82774EF
- msgbox Text_2783A8, 5
+ msgbox Text_2783A8, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq gUnknown_08277509
erasebox 0, 0, 29, 19
@@ -1029,7 +1029,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
call OldaleTown_PokemonCenter_2F_EventScript_27134F
compare VAR_RESULT, 0
goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
- msgbox OldaleTown_PokemonCenter_2F_Text_27961C, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT
closemessage
special HealPlayerParty
setvar VAR_0x8004, 6
@@ -1068,17 +1068,17 @@ OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626
return
OldaleTown_PokemonCenter_2F_EventScript_27764C:: @ 827764C
- msgbox OldaleTown_PokemonCenter_2F_Text_27893E, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_27893E, MSGBOX_DEFAULT
goto OldaleTown_PokemonCenter_2F_EventScript_273755
end
OldaleTown_PokemonCenter_2F_EventScript_27765A:: @ 827765A
- msgbox OldaleTown_PokemonCenter_2F_Text_27897B, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_27897B, MSGBOX_DEFAULT
goto OldaleTown_PokemonCenter_2F_EventScript_273755
end
OldaleTown_PokemonCenter_2F_EventScript_277668:: @ 8277668
- msgbox OldaleTown_PokemonCenter_2F_Text_2789B5, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_2789B5, MSGBOX_DEFAULT
release
return
@@ -1087,15 +1087,15 @@ OldaleTown_PokemonCenter_2F_EventScript_277672:: @ 8277672
faceplayer
checkflag FLAG_SYS_POKEDEX_GET
goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335
- msgbox OldaleTown_PokemonCenter_2F_Text_279937, 5
+ msgbox OldaleTown_PokemonCenter_2F_Text_279937, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq OldaleTown_PokemonCenter_2F_EventScript_27769A
- msgbox OldaleTown_PokemonCenter_2F_Text_2799AA, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_2799AA, MSGBOX_DEFAULT
release
return
OldaleTown_PokemonCenter_2F_EventScript_27769A:: @ 827769A
- msgbox OldaleTown_PokemonCenter_2F_Text_279C91, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_279C91, MSGBOX_DEFAULT
release
return
@@ -1165,7 +1165,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB
end
OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D
- msgbox OldaleTown_PokemonCenter_2F_Text_27909D, 5
+ msgbox OldaleTown_PokemonCenter_2F_Text_27909D, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
call OldaleTown_PokemonCenter_2F_EventScript_277199
@@ -1202,7 +1202,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899
end
OldaleTown_PokemonCenter_2F_EventScript_2778B2:: @ 82778B2
- msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, MSGBOX_DEFAULT
goto OldaleTown_PokemonCenter_2F_EventScript_27783B
end
@@ -1212,12 +1212,12 @@ OldaleTown_PokemonCenter_2F_EventScript_2778C0:: @ 82778C0
end
OldaleTown_PokemonCenter_2F_EventScript_2778CB:: @ 82778CB
- msgbox OldaleTown_PokemonCenter_2F_Text_279142, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_279142, MSGBOX_DEFAULT
goto OldaleTown_PokemonCenter_2F_EventScript_27783B
end
OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9
- msgbox OldaleTown_PokemonCenter_2F_Text_2790E8, 5
+ msgbox OldaleTown_PokemonCenter_2F_Text_2790E8, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
setvar VAR_0x8004, 12
@@ -1225,7 +1225,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9
end
OldaleTown_PokemonCenter_2F_EventScript_2778F7:: @ 82778F7
- msgbox OldaleTown_PokemonCenter_2F_Text_279114, 5
+ msgbox OldaleTown_PokemonCenter_2F_Text_279114, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
special HasAtLeastOneBerry
@@ -1236,7 +1236,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2778F7:: @ 82778F7
end
OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923
- msgbox OldaleTown_PokemonCenter_2F_Text_2788FC, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_2788FC, MSGBOX_DEFAULT
goto OldaleTown_PokemonCenter_2F_EventScript_2776E3
end
@@ -1402,12 +1402,12 @@ EventScript_WirelessBoxResults:: @ 8277B8A
fadescreen 1
special sub_801A42C
waitstate
- msgbox OldaleTown_PokemonCenter_2F_Text_27874F, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_27874F, MSGBOX_DEFAULT
releaseall
end
EventScript_277BB4:: @ 8277BB4
- msgbox OldaleTown_PokemonCenter_2F_Text_27871F, 4
+ msgbox OldaleTown_PokemonCenter_2F_Text_27871F, MSGBOX_DEFAULT
releaseall
end
@@ -1476,17 +1476,17 @@ MossdeepCity_GameCorner_1F_EventScript_277C34:: @ 8277C34
end
MossdeepCity_GameCorner_1F_EventScript_277C73:: @ 8277C73
- msgbox MossdeepCity_GameCorner_1F_Text_278ACB, 4
+ msgbox MossdeepCity_GameCorner_1F_Text_278ACB, MSGBOX_DEFAULT
release
end
MossdeepCity_GameCorner_1F_EventScript_277C7D:: @ 8277C7D
- msgbox MossdeepCity_GameCorner_1F_Text_278BF1, 4
+ msgbox MossdeepCity_GameCorner_1F_Text_278BF1, MSGBOX_DEFAULT
release
end
MossdeepCity_GameCorner_1F_EventScript_277C87:: @ 8277C87
- msgbox MossdeepCity_GameCorner_1F_Text_278CAC, 4
+ msgbox MossdeepCity_GameCorner_1F_Text_278CAC, MSGBOX_DEFAULT
release
end
@@ -1514,7 +1514,7 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9
special sub_802C920
compare VAR_RESULT, 0
goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55
- msgbox MossdeepCity_GameCorner_1F_Text_278DD9, 4
+ msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT
fadescreen 1
setvar VAR_0x8005, 0
special sub_81B8958
@@ -1533,7 +1533,7 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35
special sub_8027A5C
compare VAR_RESULT, 0
goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55
- msgbox MossdeepCity_GameCorner_1F_Text_278DD9, 4
+ msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT
fadescreen 1
setvar VAR_0x8005, 1
special sub_81B8958
@@ -1602,12 +1602,12 @@ MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E
MossdeepCity_GameCorner_1F_EventScript_277E48:: @ 8277E48
delay 60
- msgbox MossdeepCity_GameCorner_1F_Text_278D68, 4
+ msgbox MossdeepCity_GameCorner_1F_Text_278D68, MSGBOX_DEFAULT
release
end
MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55
- msgbox MossdeepCity_GameCorner_1F_Text_278E60, 5
+ msgbox MossdeepCity_GameCorner_1F_Text_278E60, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9
compare VAR_0x8005, 0
@@ -1618,11 +1618,11 @@ MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55
end
MossdeepCity_GameCorner_1F_EventScript_277E84:: @ 8277E84
- msgbox MossdeepCity_GameCorner_1F_Text_278EDC, 4
+ msgbox MossdeepCity_GameCorner_1F_Text_278EDC, MSGBOX_DEFAULT
return
MossdeepCity_GameCorner_1F_EventScript_277E8D:: @ 8277E8D
- msgbox MossdeepCity_GameCorner_1F_Text_278FA4, 4
+ msgbox MossdeepCity_GameCorner_1F_Text_278FA4, MSGBOX_DEFAULT
return
MossdeepCity_GameCorner_1F_EventScript_277E96:: @ 8277E96
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index d89c78f18..d522469c6 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -11,18 +11,18 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5
end
LilycoveCity_ContestLobby_EventScript_279CEA:: @ 8279CEA
- msgbox LilycoveCity_ContestLobby_Text_27AEA8, 4
+ msgbox LilycoveCity_ContestLobby_Text_27AEA8, MSGBOX_DEFAULT
return
LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3
- msgbox LilycoveCity_ContestLobby_Text_27ADA7, 4
+ msgbox LilycoveCity_ContestLobby_Text_27ADA7, MSGBOX_DEFAULT
giveitem_std ITEM_POKEBLOCK_CASE
setflag FLAG_0x05F
- msgbox LilycoveCity_ContestLobby_Text_27AE47, 4
+ msgbox LilycoveCity_ContestLobby_Text_27AE47, MSGBOX_DEFAULT
return
LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13
- msgbox LilycoveCity_ContestLobby_Text_27B67B, 4
+ msgbox LilycoveCity_ContestLobby_Text_27B67B, MSGBOX_DEFAULT
switch VAR_0x408A
case 4, LilycoveCity_ContestLobby_EventScript_279D2C
end
@@ -38,7 +38,7 @@ LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C
LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B
call LilycoveCity_ContestLobby_EventScript_27205E
- msgbox LilycoveCity_ContestLobby_Text_27B6E7, 4
+ msgbox LilycoveCity_ContestLobby_Text_27B6E7, MSGBOX_DEFAULT
release
end
@@ -66,27 +66,27 @@ LilycoveCity_ContestLobby_EventScript_279D97:: @ 8279D97
end
LilycoveCity_ContestLobby_EventScript_279DDF:: @ 8279DDF
- msgbox LilycoveCity_ContestLobby_Text_27AF7A, 4
+ msgbox LilycoveCity_ContestLobby_Text_27AF7A, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_279D97
end
LilycoveCity_ContestLobby_EventScript_279DED:: @ 8279DED
- msgbox LilycoveCity_ContestLobby_Text_27B17D, 4
+ msgbox LilycoveCity_ContestLobby_Text_27B17D, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_279D97
end
LilycoveCity_ContestLobby_EventScript_279DFB:: @ 8279DFB
- msgbox LilycoveCity_ContestLobby_Text_27B221, 4
+ msgbox LilycoveCity_ContestLobby_Text_27B221, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_279D97
end
LilycoveCity_ContestLobby_EventScript_279E09:: @ 8279E09
- msgbox LilycoveCity_ContestLobby_Text_27BD4F, 4
+ msgbox LilycoveCity_ContestLobby_Text_27BD4F, MSGBOX_DEFAULT
release
end
LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13
- msgbox LilycoveCity_ContestLobby_Text_27B44A, 4
+ msgbox LilycoveCity_ContestLobby_Text_27B44A, MSGBOX_DEFAULT
choosecontestmon
compare VAR_0x8004, 255
goto_eq LilycoveCity_ContestLobby_EventScript_279E09
@@ -148,39 +148,39 @@ LilycoveCity_ContestLobby_EventScript_279EE1:: @ 8279EE1
end
LilycoveCity_ContestLobby_EventScript_279F12:: @ 8279F12
- msgbox LilycoveCity_ContestLobby_Text_27B471, 4
+ msgbox LilycoveCity_ContestLobby_Text_27B471, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_279E13
release
end
LilycoveCity_ContestLobby_EventScript_279F21:: @ 8279F21
- msgbox LilycoveCity_ContestLobby_Text_27B5C4, 5
+ msgbox LilycoveCity_ContestLobby_Text_27B5C4, MSGBOX_YESNO
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_279E13
case 1, LilycoveCity_ContestLobby_EventScript_279F87
end
LilycoveCity_ContestLobby_EventScript_279F45:: @ 8279F45
- msgbox LilycoveCity_ContestLobby_Text_27B547, 5
+ msgbox LilycoveCity_ContestLobby_Text_27B547, MSGBOX_YESNO
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_279E13
case 1, LilycoveCity_ContestLobby_EventScript_279F87
end
LilycoveCity_ContestLobby_EventScript_279F69:: @ 8279F69
- msgbox LilycoveCity_ContestLobby_Text_27B4C4, 4
+ msgbox LilycoveCity_ContestLobby_Text_27B4C4, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_279E13
release
end
LilycoveCity_ContestLobby_EventScript_279F78:: @ 8279F78
- msgbox LilycoveCity_ContestLobby_Text_27B501, 4
+ msgbox LilycoveCity_ContestLobby_Text_27B501, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_279E13
release
end
LilycoveCity_ContestLobby_EventScript_279F87:: @ 8279F87
- msgbox LilycoveCity_ContestLobby_Text_27B5E2, 4
+ msgbox LilycoveCity_ContestLobby_Text_27B5E2, MSGBOX_DEFAULT
closemessage
releaseall
setvar VAR_0x4086, 1
@@ -276,7 +276,7 @@ LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1
compare VAR_0x4088, 5
goto_eq LinkContestRoom1_EventScript_27A0C7
lockall
- msgbox LinkContestRoom1_Text_27B711, 4
+ msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT
releaseall
return
@@ -388,7 +388,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2
releaseall
addvar VAR_0x8006, 65535
playse SE_BOWA2
- special sub_80F8D28
+ special ShowContestEntryMonPic
call LinkContestRoom1_EventScript_27A217
return
@@ -423,7 +423,7 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230
LinkContestRoom1_EventScript_27A26C:: @ 827A26C
compare VAR_0x4088, 5
goto_eq LinkContestRoom1_EventScript_27A280
- msgbox LinkContestRoom1_Text_27B830, 4
+ msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT
return
LinkContestRoom1_EventScript_27A280:: @ 827A280
@@ -517,7 +517,7 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F
LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5
setvar VAR_RESULT, 8
- special sub_80F8FE8
+ special ScriptRandom
compare VAR_RESULT, 0
call_if 1, LinkContestRoom1_EventScript_27A65A
compare VAR_RESULT, 1
@@ -847,7 +847,7 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801
LinkContestRoom1_EventScript_27A853:: @ 827A853
compare VAR_0x4088, 5
goto_eq LinkContestRoom1_EventScript_27A867
- msgbox LinkContestRoom1_Text_27B904, 4
+ msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT
return
LinkContestRoom1_EventScript_27A867:: @ 827A867
@@ -897,7 +897,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5
LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB
compare VAR_0x4088, 5
goto_eq LinkContestRoom1_EventScript_27A90F
- msgbox LinkContestRoom1_Text_27BA15, 4
+ msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT
return
LinkContestRoom1_EventScript_27A90F:: @ 827A90F
@@ -910,7 +910,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F
LinkContestRoom1_EventScript_27A91E:: @ 827A91E
compare VAR_0x4088, 5
goto_eq LinkContestRoom1_EventScript_27A932
- msgbox LinkContestRoom1_Text_27BA30, 4
+ msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT
return
LinkContestRoom1_EventScript_27A932:: @ 827A932
@@ -923,7 +923,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932
LinkContestRoom1_EventScript_27A941:: @ 827A941
compare VAR_0x4088, 5
goto_eq LinkContestRoom1_EventScript_27A955
- msgbox LinkContestRoom1_Text_27BAAC, 4
+ msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT
return
LinkContestRoom1_EventScript_27A955:: @ 827A955
@@ -936,7 +936,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955
LinkContestRoom1_EventScript_27A964:: @ 827A964
compare VAR_0x4088, 5
goto_eq LinkContestRoom1_EventScript_27A978
- msgbox LinkContestRoom1_Text_27BB25, 4
+ msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT
return
LinkContestRoom1_EventScript_27A978:: @ 827A978
@@ -987,7 +987,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4
LinkContestRoom1_EventScript_27AA00:: @ 827AA00
compare VAR_0x4088, 5
goto_eq LinkContestRoom1_EventScript_27AA14
- msgbox LinkContestRoom1_Text_27BB4C, 4
+ msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT
return
LinkContestRoom1_EventScript_27AA14:: @ 827AA14
@@ -1086,10 +1086,10 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36
compare VAR_0x4088, 5
goto_eq LinkContestRoom1_EventScript_27ABD8
call LinkContestRoom1_EventScript_27AB9E
- checkflag FLAG_0x002
+ checkflag FLAG_TEMP_2
goto_eq LinkContestRoom1_EventScript_27AB82
lockall
- msgbox LinkContestRoom1_Text_27BBA8, 4
+ msgbox LinkContestRoom1_Text_27BBA8, MSGBOX_DEFAULT
releaseall
call LinkContestRoom1_EventScript_27ABF8
call LinkContestRoom1_EventScript_27AC5E
@@ -1104,7 +1104,7 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36
LinkContestRoom1_EventScript_27AB82:: @ 827AB82
lockall
- msgbox LinkContestRoom1_Text_27BB7A, 4
+ msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
releaseall
delay 90
special sub_80F88E8
@@ -1127,7 +1127,7 @@ LinkContestRoom1_EventScript_27ABAF:: @ 827ABAF
LinkContestRoom1_EventScript_27ABBE:: @ 827ABBE
compare VAR_CONTEST_RANK, 3
goto_eq LinkContestRoom1_EventScript_27ABCD
- setflag FLAG_0x002
+ setflag FLAG_TEMP_2
return
LinkContestRoom1_EventScript_27ABCD:: @ 827ABCD
@@ -1199,7 +1199,7 @@ LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E
compare VAR_0x8005, 3
goto_eq LinkContestRoom1_EventScript_27AC77
lockall
- msgbox LinkContestRoom1_Text_27BB7A, 4
+ msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
releaseall
return
@@ -1212,14 +1212,14 @@ LinkContestRoom1_EventScript_27AC77:: @ 827AC77
compare VAR_CONTEST_RANK, 3
goto_eq LinkContestRoom1_EventScript_27ACBD
lockall
- msgbox LinkContestRoom1_Text_27BB7A, 4
+ msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
releaseall
return
LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8
lockall
call LinkContestRoom1_EventScript_27205E
- msgbox LinkContestRoom1_Text_27BC2F, 4
+ msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT
releaseall
setvar VAR_0x408A, 4
return
@@ -1229,7 +1229,7 @@ LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD
compare VAR_RESULT, 0
goto_eq LinkContestRoom1_EventScript_27ACA8
lockall
- msgbox LinkContestRoom1_Text_27BB7A, 4
+ msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
releaseall
return
@@ -1238,12 +1238,12 @@ LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF
incrementgamestat 42
setflag FLAG_SYS_RIBBON_GET
lockall
- msgbox LinkContestRoom1_Text_27BBD4, 4
+ msgbox LinkContestRoom1_Text_27BBD4, MSGBOX_DEFAULT
playfanfare MUS_FANFA4
- msgbox LinkContestRoom1_Text_27BC00, 4
+ msgbox LinkContestRoom1_Text_27BC00, MSGBOX_DEFAULT
waitfanfare
special sub_80F8390
- msgbox LinkContestRoom1_Text_27BC16, 4
+ msgbox LinkContestRoom1_Text_27BC16, MSGBOX_DEFAULT
releaseall
return
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 7b306a261..3a2194132 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -9,18 +9,18 @@ Route117_EventScript_291C18:: @ 8291C18
goto_eq Route117_EventScript_291CD1
compare VAR_RESULT, 3
goto_eq Route117_EventScript_291CE8
- msgbox Route117_Text_291FCF, 4
+ msgbox Route117_Text_291FCF, MSGBOX_DEFAULT
release
end
Route117_EventScript_291C4D:: @ 8291C4D
- msgbox Route117_Text_29205D, 5
+ msgbox Route117_Text_29205D, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route117_EventScript_291C83
- msgbox Route117_Text_2922C6, 5
+ msgbox Route117_Text_2922C6, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route117_EventScript_291C83
- msgbox Route117_Text_292149, 4
+ msgbox Route117_Text_292149, MSGBOX_DEFAULT
clearflag FLAG_PENDING_DAYCARE_EGG
special RejectEggFromDayCare
release
@@ -30,7 +30,7 @@ Route117_EventScript_291C83:: @ 8291C83
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare VAR_RESULT, 6
goto_if 5, Route117_EventScript_291C9D
- msgbox Route117_Text_29216A, 4
+ msgbox Route117_Text_29216A, MSGBOX_DEFAULT
release
end
@@ -39,7 +39,7 @@ Route117_EventScript_291C9D:: @ 8291C9D
playfanfare MUS_FANFA1
waitfanfare
waitbuttonpress
- msgbox Route117_Text_2921CF, 4
+ msgbox Route117_Text_2921CF, MSGBOX_DEFAULT
special GiveEggFromDaycare
clearflag FLAG_PENDING_DAYCARE_EGG
release
@@ -52,12 +52,12 @@ Route117_EventScript_291CB7:: @ 8291CB7
return
Route117_EventScript_291CC8:: @ 8291CC8
- msgbox Route117_Text_2921E5, 4
+ msgbox Route117_Text_2921E5, MSGBOX_DEFAULT
return
Route117_EventScript_291CD1:: @ 8291CD1
special GetDaycareMonNicknames
- msgbox Route117_Text_292114, 4
+ msgbox Route117_Text_292114, MSGBOX_DEFAULT
setvar VAR_0x8004, 0
call Route117_EventScript_291CB7
release
@@ -65,7 +65,7 @@ Route117_EventScript_291CD1:: @ 8291CD1
Route117_EventScript_291CE8:: @ 8291CE8
special GetDaycareMonNicknames
- msgbox Route117_Text_292299, 4
+ msgbox Route117_Text_292299, MSGBOX_DEFAULT
special SetDaycareCompatibilityString
special ShowFieldMessageStringVar4
waitmessage
@@ -87,10 +87,10 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11
goto_eq Route117_PokemonDayCare_EventScript_291E2F
compare VAR_RESULT, 3
goto_eq Route117_PokemonDayCare_EventScript_291F5C
- msgbox Route117_PokemonDayCare_Text_2922F4, 5
+ msgbox Route117_PokemonDayCare_Text_2922F4, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route117_PokemonDayCare_EventScript_291D56
- msgbox Route117_PokemonDayCare_Text_292416, 4
+ msgbox Route117_PokemonDayCare_Text_292416, MSGBOX_DEFAULT
release
end
@@ -101,7 +101,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56
specialvar VAR_RESULT, sub_80722E0
compare VAR_RESULT, 2
goto_eq Route117_PokemonDayCare_EventScript_291E01
- msgbox Route117_PokemonDayCare_Text_292349, 4
+ msgbox Route117_PokemonDayCare_Text_292349, MSGBOX_DEFAULT
fadescreen 1
special ChooseSendDaycareMon
waitstate
@@ -113,7 +113,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56
specialvar VAR_0x8005, GetSelectedMonNickAndSpecies
waitse
playmoncry VAR_0x8005, 0
- msgbox Route117_PokemonDayCare_Text_292370, 4
+ msgbox Route117_PokemonDayCare_Text_292370, MSGBOX_DEFAULT
waitmoncry
special StoreSelectedPokemonInDaycare
incrementgamestat 47
@@ -124,39 +124,39 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56
end
Route117_PokemonDayCare_EventScript_291DCA:: @ 8291DCA
- msgbox Route117_PokemonDayCare_Text_292476, 4
+ msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT
release
end
Route117_PokemonDayCare_EventScript_291DD4:: @ 8291DD4
- msgbox Route117_PokemonDayCare_Text_2923AF, 5
+ msgbox Route117_PokemonDayCare_Text_2923AF, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route117_PokemonDayCare_EventScript_291D56
goto Route117_PokemonDayCare_EventScript_291DCA
end
Route117_PokemonDayCare_EventScript_291DED:: @ 8291DED
- msgbox Route117_PokemonDayCare_Text_2925BB, 4
+ msgbox Route117_PokemonDayCare_Text_2925BB, MSGBOX_DEFAULT
release
end
Route117_PokemonDayCare_EventScript_291DF7:: @ 8291DF7
- msgbox Route117_PokemonDayCare_Text_292617, 4
+ msgbox Route117_PokemonDayCare_Text_292617, MSGBOX_DEFAULT
release
end
Route117_PokemonDayCare_EventScript_291E01:: @ 8291E01
- msgbox Route117_PokemonDayCare_Text_29266D, 4
+ msgbox Route117_PokemonDayCare_Text_29266D, MSGBOX_DEFAULT
release
end
Route117_PokemonDayCare_EventScript_291E0B:: @ 8291E0B
- msgbox Route117_PokemonDayCare_Text_2923F6, 4
+ msgbox Route117_PokemonDayCare_Text_2923F6, MSGBOX_DEFAULT
release
end
Route117_PokemonDayCare_EventScript_291E15:: @ 8291E15
- msgbox Route117_PokemonDayCare_Text_2924CC, 4
+ msgbox Route117_PokemonDayCare_Text_2924CC, MSGBOX_DEFAULT
return
Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E
@@ -166,13 +166,13 @@ Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E
return
Route117_PokemonDayCare_EventScript_291E2F:: @ 8291E2F
- msgbox Route117_PokemonDayCare_Text_292488, 4
+ msgbox Route117_PokemonDayCare_Text_292488, MSGBOX_DEFAULT
setvar VAR_0x8004, 0
call Route117_PokemonDayCare_EventScript_291E1E
- msgbox Route117_PokemonDayCare_Text_2923AF, 5
+ msgbox Route117_PokemonDayCare_Text_2923AF, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route117_PokemonDayCare_EventScript_291D56
- msgbox Route117_PokemonDayCare_Text_2925F6, 5
+ msgbox Route117_PokemonDayCare_Text_2925F6, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route117_PokemonDayCare_EventScript_291E6D
goto Route117_PokemonDayCare_EventScript_291DCA
@@ -196,7 +196,7 @@ Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D
Route117_PokemonDayCare_EventScript_291EAC:: @ 8291EAC
special GetDaycareCost
- msgbox Route117_PokemonDayCare_Text_292549, 5
+ msgbox Route117_PokemonDayCare_Text_292549, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route117_PokemonDayCare_EventScript_291EC8
goto Route117_PokemonDayCare_EventScript_291DCA
@@ -206,7 +206,7 @@ Route117_PokemonDayCare_EventScript_291EC8:: @ 8291EC8
specialvar VAR_RESULT, IsEnoughForCostInVar0x8005
compare VAR_RESULT, 1
goto_eq Route117_PokemonDayCare_EventScript_291EE2
- msgbox Route117_PokemonDayCare_Text_292432, 4
+ msgbox Route117_PokemonDayCare_Text_292432, MSGBOX_DEFAULT
release
end
@@ -216,10 +216,10 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2
specialvar VAR_RESULT, TakePokemonFromDaycare
special SubtractMoneyFromVar0x8005
playse SE_REGI
- msgbox Route117_PokemonDayCare_Text_292575, 4
+ msgbox Route117_PokemonDayCare_Text_292575, MSGBOX_DEFAULT
waitse
playmoncry VAR_RESULT, 0
- msgbox Route117_PokemonDayCare_Text_292593, 4
+ msgbox Route117_PokemonDayCare_Text_292593, MSGBOX_DEFAULT
waitmoncry
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, 2
@@ -228,14 +228,14 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2
end
Route117_PokemonDayCare_EventScript_291F24:: @ 8291F24
- msgbox Route117_PokemonDayCare_Text_29244F, 5
+ msgbox Route117_PokemonDayCare_Text_29244F, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route117_PokemonDayCare_EventScript_291E6D
goto Route117_PokemonDayCare_EventScript_291DCA
end
Route117_PokemonDayCare_EventScript_291F3D:: @ 8291F3D
- msgbox Route117_PokemonDayCare_Text_2924EF, 4
+ msgbox Route117_PokemonDayCare_Text_2924EF, MSGBOX_DEFAULT
release
end
@@ -265,15 +265,15 @@ Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B
end
Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C
- msgbox Route117_PokemonDayCare_Text_292488, 4
+ msgbox Route117_PokemonDayCare_Text_292488, MSGBOX_DEFAULT
setvar VAR_0x8004, 0
call Route117_PokemonDayCare_EventScript_291E1E
setvar VAR_0x8004, 1
call Route117_PokemonDayCare_EventScript_291E1E
- msgbox Route117_PokemonDayCare_Text_2925F6, 5
+ msgbox Route117_PokemonDayCare_Text_2925F6, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route117_PokemonDayCare_EventScript_291E6D
- msgbox Route117_PokemonDayCare_Text_292476, 4
+ msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT
release
end
@@ -284,14 +284,14 @@ Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95
goto_eq Route117_PokemonDayCare_EventScript_291DCA
copyvar VAR_0x8004, VAR_RESULT
specialvar VAR_RESULT, TakePokemonFromDaycare
- msgbox Route117_PokemonDayCare_Text_292575, 4
- msgbox Route117_PokemonDayCare_Text_292476, 4
+ msgbox Route117_PokemonDayCare_Text_292575, MSGBOX_DEFAULT
+ msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT
release
end
EventScript_EggHatch:: @ 8291FC0
lockall
- msgbox Text_292668, 4
+ msgbox Text_292668, MSGBOX_DEFAULT
special EggHatch
waitstate
releaseall
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index aba6bec97..15bb7a7e6 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -18,10 +18,10 @@ Route123_EventScript_2906BB:: @ 82906BB
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick 0, VAR_RESULT
buffermovename 1, MOVE_CUT
- msgbox Route103_Text_29072E, 5
+ msgbox Route103_Text_29072E, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq Route103_EventScript_29072B
- msgbox Route103_Text_290771, 4
+ msgbox Route103_Text_290771, MSGBOX_DEFAULT
closemessage
dofieldeffect 2
waitstate
@@ -47,7 +47,7 @@ Route103_Movement_29071F: @ 829071F
step_end
Route103_EventScript_290721:: @ 8290721
- msgbox Route103_Text_29077D, 4
+ msgbox Route103_Text_29077D, MSGBOX_DEFAULT
releaseall
end
@@ -92,10 +92,10 @@ VictoryRoad_B1F_EventScript_2907A6:: @ 82907A6
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick 0, VAR_RESULT
buffermovename 1, MOVE_ROCK_SMASH
- msgbox Route111_Text_29083A, 5
+ msgbox Route111_Text_29083A, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq Route111_EventScript_290837
- msgbox Route111_Text_290771, 4
+ msgbox Route111_Text_290771, MSGBOX_DEFAULT
closemessage
dofieldeffect 37
waitstate
@@ -132,7 +132,7 @@ Route111_Movement_29082B: @ 829082B
step_end
Route111_EventScript_29082D:: @ 829082D
- msgbox Route111_Text_29087F, 4
+ msgbox Route111_Text_29087F, MSGBOX_DEFAULT
releaseall
end
@@ -168,7 +168,7 @@ VictoryRoad_B1F_EventScript_2908BA:: @ 82908BA
compare VAR_RESULT, 6
goto_eq FieryPath_EventScript_290915
setfieldeffectargument 0, VAR_RESULT
- msgbox FieryPath_Text_29092C, 5
+ msgbox FieryPath_Text_29092C, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq FieryPath_EventScript_290929
closemessage
@@ -186,17 +186,17 @@ FieryPath_EventScript_2908FD:: @ 82908FD
FieryPath_EventScript_290908:: @ 8290908
setflag FLAG_SYS_USE_STRENGTH
- msgbox FieryPath_Text_29098C, 4
+ msgbox FieryPath_Text_29098C, MSGBOX_DEFAULT
releaseall
end
FieryPath_EventScript_290915:: @ 8290915
- msgbox FieryPath_Text_2909D6, 4
+ msgbox FieryPath_Text_2909D6, MSGBOX_DEFAULT
releaseall
end
FieryPath_EventScript_29091F:: @ 829091F
- msgbox FieryPath_Text_290A16, 4
+ msgbox FieryPath_Text_290A16, MSGBOX_DEFAULT
releaseall
end
@@ -230,10 +230,10 @@ EventScript_UseWaterfall:: @ 8290A49
goto_eq EventScript_290A84
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
- msgbox Text_290AC3, 5
+ msgbox Text_290AC3, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq EventScript_290A8C
- msgbox Text_290AFC, 4
+ msgbox Text_290AFC, MSGBOX_DEFAULT
dofieldeffect 43
goto EventScript_290A8C
@@ -241,7 +241,7 @@ EventScript_CannotUseWaterfall:: @ 8290A83
lockall
EventScript_290A84:: @ 8290A84
- msgbox Text_290A8E, 4
+ msgbox Text_290A8E, MSGBOX_DEFAULT
EventScript_290A8C:: @ 8290A8C
releaseall
@@ -266,16 +266,16 @@ EventScript_UseDive:: @ 8290B0F
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
setfieldeffectargument 1, 1
- msgbox Text_290BE8, 5
+ msgbox Text_290BE8, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq EventScript_290B58
- msgbox Text_290C1A, 4
+ msgbox Text_290C1A, MSGBOX_DEFAULT
dofieldeffect 44
goto EventScript_290B58
end
EventScript_290B4E:: @ 8290B4E
- msgbox Text_290BAA, 4
+ msgbox Text_290BAA, MSGBOX_DEFAULT
releaseall
end
@@ -291,17 +291,17 @@ EventScript_UseDiveUnderwater:: @ 8290B5A
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
setfieldeffectargument 1, 1
- msgbox Text_290C6E, 5
+ msgbox Text_290C6E, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq EventScript_290BA8
- msgbox Text_290C1A, 4
+ msgbox Text_290C1A, MSGBOX_DEFAULT
dofieldeffect 44
goto EventScript_290BA8
end
EventScript_290B99:: @ 8290B99
lockall
- msgbox Text_290C28, 4
+ msgbox Text_290C28, MSGBOX_DEFAULT
goto EventScript_290BA8
end
@@ -329,7 +329,7 @@ Text_290C6E: @ 8290C6E
.string "Would you like to use DIVE?$"
EventScript_290CAE:: @ 8290CAE
- msgbox Text_290CB7, 3
+ msgbox Text_290CB7, MSGBOX_SIGN
end
Text_290CB7: @ 8290CB7
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 5a03a0e98..f95cfa0ab 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -72,142 +72,142 @@ Route111_EventScript_28CD8B:: @ 828CD8B
return
Route111_EventScript_28CD96:: @ 828CD96
- setflag FLAG_0x31C
+ setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
return
Route111_EventScript_28CD9A:: @ 828CD9A
- clearflag FLAG_0x31C
+ clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
return
Route111_EventScript_28CD9E:: @ 828CD9E
- setflag FLAG_0x31D
+ setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
return
Route111_EventScript_28CDA2:: @ 828CDA2
- clearflag FLAG_0x31D
+ clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
return
Route111_EventScript_28CDA6:: @ 828CDA6
- setflag FLAG_0x31E
+ setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
return
Route111_EventScript_28CDAA:: @ 828CDAA
- clearflag FLAG_0x31E
+ clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
return
Route111_EventScript_28CDAE:: @ 828CDAE
- setflag FLAG_0x31F
+ setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
return
Route111_EventScript_28CDB2:: @ 828CDB2
- clearflag FLAG_0x31F
+ clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
return
Route111_EventScript_28CDB6:: @ 828CDB6
- setflag FLAG_0x385
+ setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
return
Route111_EventScript_28CDBA:: @ 828CDBA
- clearflag FLAG_0x385
+ clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
return
Route111_EventScript_28CDBE:: @ 828CDBE
- setflag FLAG_0x386
+ setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
return
Route111_EventScript_28CDC2:: @ 828CDC2
- clearflag FLAG_0x386
+ clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
return
Route111_EventScript_28CDC6:: @ 828CDC6
- setflag FLAG_0x387
+ setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
return
Route111_EventScript_28CDCA:: @ 828CDCA
- clearflag FLAG_0x387
+ clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
return
Route111_EventScript_28CDCE:: @ 828CDCE
- setflag FLAG_0x388
+ setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
return
Route111_EventScript_28CDD2:: @ 828CDD2
- clearflag FLAG_0x388
+ clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
return
Route111_EventScript_28CDD6:: @ 828CDD6
- trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_28AF05, Route111_Text_28B000, Route111_Text_28B5EC, Route111_EventScript_28CF56
- msgbox Route111_Text_28B5C0, 4
+ trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28AF05, Route111_Text_28B000, Route111_Text_28B5EC, Route111_EventScript_28CF56
+ msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
release
end
Route111_EventScript_28CDF6:: @ 828CDF6
- trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_28B75C, Route111_Text_28B8B1, Route111_Text_28B841, Route111_EventScript_28CF56
- msgbox Route111_Text_28B805, 4
+ trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28B75C, Route111_Text_28B8B1, Route111_Text_28B841, Route111_EventScript_28CF56
+ msgbox Route111_Text_28B805, MSGBOX_DEFAULT
release
end
Route118_EventScript_28CE16:: @ 828CE16
- trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3
- msgbox Route118_Text_28B5C0, 4
+ trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3
+ msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT
release
end
Route118_EventScript_28CE36:: @ 828CE36
- trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3
- msgbox Route118_Text_28B805, 4
+ trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3
+ msgbox Route118_Text_28B805, MSGBOX_DEFAULT
release
end
Route120_EventScript_28CE56:: @ 828CE56
- trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_28AF7D, Route120_Text_28B719, Route120_Text_28B5EC, Route120_EventScript_28CFC3
- msgbox Route120_Text_28B5C0, 4
+ trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28AF7D, Route120_Text_28B719, Route120_Text_28B5EC, Route120_EventScript_28CFC3
+ msgbox Route120_Text_28B5C0, MSGBOX_DEFAULT
release
end
Route120_EventScript_28CE76:: @ 828CE76
- trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_28B7B1, Route120_Text_28B8F6, Route120_Text_28B841, Route120_EventScript_28CFC3
- msgbox Route120_Text_28B805, 4
+ trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28B7B1, Route120_Text_28B8F6, Route120_Text_28B841, Route120_EventScript_28CFC3
+ msgbox Route120_Text_28B805, MSGBOX_DEFAULT
release
end
Route111_EventScript_28CE96:: @ 828CE96
- trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3
- msgbox Route111_Text_28B5C0, 4
+ trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3
+ msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
release
end
Route111_EventScript_28CEB6:: @ 828CEB6
- trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3
- msgbox Route111_Text_28B805, 4
+ trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3
+ msgbox Route111_Text_28B805, MSGBOX_DEFAULT
release
end
Route118_EventScript_28CED6:: @ 828CED6
- trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3
- msgbox Route118_Text_28B5C0, 4
+ trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3
+ msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT
release
end
Route118_EventScript_28CEF6:: @ 828CEF6
- trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3
- msgbox Route118_Text_28B805, 4
+ trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3
+ msgbox Route118_Text_28B805, MSGBOX_DEFAULT
release
end
Route111_EventScript_28CF16:: @ 828CF16
Route118_EventScript_28CF16:: @ 828CF16
Route120_EventScript_28CF16:: @ 828CF16
- trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3
- msgbox Route111_Text_28B5C0, 4
+ trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3
+ msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
release
end
Route111_EventScript_28CF36:: @ 828CF36
Route118_EventScript_28CF36:: @ 828CF36
Route120_EventScript_28CF36:: @ 828CF36
- trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3
- msgbox Route111_Text_28B805, 4
+ trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3
+ msgbox Route111_Text_28B805, MSGBOX_DEFAULT
release
end
@@ -220,9 +220,9 @@ Route111_EventScript_28CF56:: @ 828CF56
call_if 1, Route111_EventScript_28CF9F
compare VAR_FACING, 4
call_if 1, Route111_EventScript_28CFB1
- checkflag FLAG_0x001
+ checkflag FLAG_TEMP_1
goto_eq Route111_EventScript_28D0EE
- msgbox Route111_Text_28B042, 5
+ msgbox Route111_Text_28B042, MSGBOX_YESNO
goto Route111_EventScript_28D0A7
end
@@ -254,12 +254,12 @@ Route120_EventScript_28CFC3:: @ 828CFC3
call_if 1, Route111_EventScript_28CF9F
compare VAR_FACING, 4
call_if 1, Route111_EventScript_28CFB1
- checkflag FLAG_0x001
+ checkflag FLAG_TEMP_1
goto_eq Route111_EventScript_28D0EE
specialvar VAR_RESULT, GabbyAndTyGetLastQuote
compare VAR_RESULT, 0
goto_eq Route111_EventScript_28D053
- msgbox Route111_Text_28B137, 4
+ msgbox Route111_Text_28B137, MSGBOX_DEFAULT
specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia
switch VAR_RESULT
case 0, Route111_EventScript_28D061
@@ -282,58 +282,58 @@ Route111_Movement_28D051: @ 828D051
step_end
Route111_EventScript_28D053:: @ 828D053
- msgbox Route111_Text_28B62D, 5
+ msgbox Route111_Text_28B62D, MSGBOX_YESNO
goto Route111_EventScript_28D0A7
end
Route111_EventScript_28D061:: @ 828D061
- msgbox Route111_Text_28B3F3, 5
+ msgbox Route111_Text_28B3F3, MSGBOX_YESNO
goto Route111_EventScript_28D0A7
end
Route111_EventScript_28D06F:: @ 828D06F
- msgbox Route111_Text_28B1B3, 5
+ msgbox Route111_Text_28B1B3, MSGBOX_YESNO
goto Route111_EventScript_28D0A7
end
Route111_EventScript_28D07D:: @ 828D07D
- msgbox Route111_Text_28B23D, 5
+ msgbox Route111_Text_28B23D, MSGBOX_YESNO
goto Route111_EventScript_28D0A7
end
Route111_EventScript_28D08B:: @ 828D08B
- msgbox Route111_Text_28B2FA, 5
+ msgbox Route111_Text_28B2FA, MSGBOX_YESNO
goto Route111_EventScript_28D0A7
end
Route111_EventScript_28D099:: @ 828D099
- msgbox Route111_Text_28B379, 5
+ msgbox Route111_Text_28B379, MSGBOX_YESNO
goto Route111_EventScript_28D0A7
end
Route111_EventScript_28D0A7:: @ 828D0A7
compare VAR_RESULT, 0
goto_eq Route111_EventScript_28D0E1
- msgbox Route111_Text_28B433, 4
+ msgbox Route111_Text_28B433, MSGBOX_DEFAULT
setvar VAR_0x8004, 10
call Route111_EventScript_271E7C
lock
faceplayer
compare VAR_RESULT, 0
goto_eq Route111_EventScript_28D0E1
- msgbox Route111_Text_28B4AB, 4
+ msgbox Route111_Text_28B4AB, MSGBOX_DEFAULT
special GabbyAndTyAfterInterview
- setflag FLAG_0x001
+ setflag FLAG_TEMP_1
release
end
Route111_EventScript_28D0E1:: @ 828D0E1
- msgbox Route111_Text_28B577, 4
- setflag FLAG_0x001
+ msgbox Route111_Text_28B577, MSGBOX_DEFAULT
+ setflag FLAG_TEMP_1
release
end
Route111_EventScript_28D0EE:: @ 828D0EE
- msgbox Route111_Text_28B5C0, 4
+ msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
release
end
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 46be101e1..52ae750b0 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -11,7 +11,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E066:: @ 828E066
MauvilleCity_PokemonCenter_1F_EventScript_28E0A6:: @ 828E0A6
lock
faceplayer
- msgbox MauvilleCity_PokemonCenter_1F_Text_29038E, 5
+ msgbox MauvilleCity_PokemonCenter_1F_Text_29038E, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0C7
compare VAR_RESULT, 0
@@ -25,17 +25,17 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7
special ScrSpecial_HasBardSongBeenChanged
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4
- msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, MSGBOX_DEFAULT
release
end
MauvilleCity_PokemonCenter_1F_EventScript_28E0EA:: @ 828E0EA
- msgbox MauvilleCity_PokemonCenter_1F_Text_2903C0, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_2903C0, MSGBOX_DEFAULT
release
end
MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4
- msgbox MauvilleCity_PokemonCenter_1F_Text_290421, 5
+ msgbox MauvilleCity_PokemonCenter_1F_Text_290421, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113
compare VAR_RESULT, 0
@@ -49,20 +49,20 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113
faceplayer
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D
- msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, MSGBOX_DEFAULT
setvar VAR_0x8004, 1
special ScrSpecial_PlayBardSong
delay 60
- msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, 5
+ msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113
special ScrSpecial_SaveBardSongLyrics
- msgbox MauvilleCity_PokemonCenter_1F_Text_290514, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_290514, MSGBOX_DEFAULT
release
end
MauvilleCity_PokemonCenter_1F_EventScript_28E15D:: @ 828E15D
- msgbox MauvilleCity_PokemonCenter_1F_Text_29049B, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_29049B, MSGBOX_DEFAULT
release
end
@@ -70,11 +70,11 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167
lock
faceplayer
setflag FLAG_SYS_HIPSTER_MEET
- msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, MSGBOX_DEFAULT
special ScrSpecial_GetHipsterSpokenFlag
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C
- msgbox MauvilleCity_PokemonCenter_1F_Text_290598, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_290598, MSGBOX_DEFAULT
release
end
@@ -82,12 +82,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C
special ScrSpecial_HipsterTeachWord
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4
- msgbox MauvilleCity_PokemonCenter_1F_Text_290602, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_290602, MSGBOX_DEFAULT
release
end
MauvilleCity_PokemonCenter_1F_EventScript_28E1A4:: @ 828E1A4
- msgbox MauvilleCity_PokemonCenter_1F_Text_290666, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_290666, MSGBOX_DEFAULT
special ScrSpecial_SetHipsterSpokenFlag
release
end
@@ -154,7 +154,7 @@ MauvilleCity_PokemonCenter_1F_Text_28E45A: @ 828E45A
MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4
lock
faceplayer
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, 5
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503
special ScrSpecial_GetTraderTradedFlag
@@ -166,12 +166,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4
end
MauvilleCity_PokemonCenter_1F_EventScript_28E503:: @ 828E503
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E1E8, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E1E8, MSGBOX_DEFAULT
release
end
MauvilleCity_PokemonCenter_1F_EventScript_28E50D:: @ 828E50D
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E20E, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E20E, MSGBOX_DEFAULT
release
end
@@ -182,7 +182,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558
compare VAR_0x8004, 65535
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E562
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, 5
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E
special ScrSpecial_DoesPlayerHaveNoDecorations
@@ -192,7 +192,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517
end
MauvilleCity_PokemonCenter_1F_EventScript_28E558:: @ 828E558
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E27F, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E27F, MSGBOX_DEFAULT
release
end
@@ -209,12 +209,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E56E:: @ 828E56E
end
MauvilleCity_PokemonCenter_1F_EventScript_28E57A:: @ 828E57A
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E2E3, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E2E3, MSGBOX_DEFAULT
release
end
MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, MSGBOX_DEFAULT
special ScrSpecial_TraderMenuGiveDecoration
waitstate
compare VAR_0x8006, 0
@@ -224,26 +224,26 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584
special ScrSpecial_IsDecorationFull
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, 5
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584
special ScrSpecial_TraderDoDecorationTrade
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, MSGBOX_DEFAULT
release
end
MauvilleCity_PokemonCenter_1F_EventScript_28E5D4:: @ 828E5D4
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E356, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E356, MSGBOX_DEFAULT
release
end
MauvilleCity_PokemonCenter_1F_EventScript_28E5DE:: @ 828E5DE
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E3EC, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E3EC, MSGBOX_DEFAULT
goto MauvilleCity_PokemonCenter_1F_EventScript_28E584
end
MauvilleCity_PokemonCenter_1F_EventScript_28E5EC:: @ 828E5EC
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E380, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E380, MSGBOX_DEFAULT
release
end
@@ -810,7 +810,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A
setvar VAR_0x8009, 0
setvar VAR_0x800A, 0
setvar VAR_0x800B, 0
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, 5
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219
specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot
@@ -836,38 +836,38 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901B7:: @ 82901B7
end
MauvilleCity_PokemonCenter_1F_EventScript_2901BD:: @ 82901BD
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, MSGBOX_DEFAULT
specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D
goto MauvilleCity_PokemonCenter_1F_EventScript_2901E2
MauvilleCity_PokemonCenter_1F_EventScript_2901DA:: @ 82901DA
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E6AE, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E6AE, MSGBOX_DEFAULT
MauvilleCity_PokemonCenter_1F_EventScript_2901E2:: @ 82901E2
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, 5
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219
specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, MSGBOX_DEFAULT
release
end
MauvilleCity_PokemonCenter_1F_EventScript_29020F:: @ 829020F
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E726, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E726, MSGBOX_DEFAULT
release
end
MauvilleCity_PokemonCenter_1F_EventScript_290219:: @ 8290219
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E64D, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E64D, MSGBOX_DEFAULT
release
end
MauvilleCity_PokemonCenter_1F_EventScript_290223:: @ 8290223
- msgbox MauvilleCity_PokemonCenter_1F_Text_28E8D9, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_28E8D9, MSGBOX_DEFAULT
release
end
@@ -895,7 +895,7 @@ MauvilleCity_PokemonCenter_1F_Text_2902BD: @ 82902BD
MauvilleCity_PokemonCenter_1F_EventScript_2902F6:: @ 82902F6
lock
faceplayer
- msgbox MauvilleCity_PokemonCenter_1F_Text_29022F, 5
+ msgbox MauvilleCity_PokemonCenter_1F_Text_29022F, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290317
compare VAR_RESULT, 0
@@ -919,7 +919,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_290331:: @ 8290331
end
MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B
- msgbox MauvilleCity_PokemonCenter_1F_Text_2902A7, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_2902A7, MSGBOX_DEFAULT
goto MauvilleCity_PokemonCenter_1F_EventScript_290359
end
@@ -935,12 +935,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359
end
MauvilleCity_PokemonCenter_1F_EventScript_29037A:: @ 829037A
- msgbox MauvilleCity_PokemonCenter_1F_Text_290281, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_290281, MSGBOX_DEFAULT
release
end
MauvilleCity_PokemonCenter_1F_EventScript_290384:: @ 8290384
- msgbox MauvilleCity_PokemonCenter_1F_Text_2902BD, 4
+ msgbox MauvilleCity_PokemonCenter_1F_Text_2902BD, MSGBOX_DEFAULT
release
end
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index 3fba532bf..cd2885ea5 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -3,12 +3,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_291539:: @ 8291539
faceplayer
checkflag FLAG_SYS_CHAT_USED
goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915F5
- msgbox PetalburgCity_PokemonCenter_1F_Text_291687, 4
+ msgbox PetalburgCity_PokemonCenter_1F_Text_291687, MSGBOX_DEFAULT
goto PetalburgCity_PokemonCenter_1F_EventScript_291552
end
PetalburgCity_PokemonCenter_1F_EventScript_291552:: @ 8291552
- msgbox PetalburgCity_PokemonCenter_1F_Text_2916FF, 4
+ msgbox PetalburgCity_PokemonCenter_1F_Text_2916FF, MSGBOX_DEFAULT
multichoice 17, 6, 20, 0
switch VAR_RESULT
case 0, PetalburgCity_PokemonCenter_1F_EventScript_29159F
@@ -18,12 +18,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_291552:: @ 8291552
end
PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591
- msgbox PetalburgCity_PokemonCenter_1F_Text_291729, 4
+ msgbox PetalburgCity_PokemonCenter_1F_Text_291729, MSGBOX_DEFAULT
goto PetalburgCity_PokemonCenter_1F_EventScript_291552
end
PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F
- msgbox PetalburgCity_PokemonCenter_1F_Text_291969, 4
+ msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, 0
call PetalburgCity_PokemonCenter_1F_EventScript_271E7C
@@ -36,7 +36,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F
end
PetalburgCity_PokemonCenter_1F_EventScript_2915CB:: @ 82915CB
- msgbox PetalburgCity_PokemonCenter_1F_Text_2919DC, 4
+ msgbox PetalburgCity_PokemonCenter_1F_Text_2919DC, MSGBOX_DEFAULT
release
end
@@ -45,22 +45,22 @@ PetalburgCity_PokemonCenter_1F_EventScript_2915D5:: @ 82915D5
special sub_811EECC
waitmessage
delay 80
- msgbox PetalburgCity_PokemonCenter_1F_Text_291B22, 4
+ msgbox PetalburgCity_PokemonCenter_1F_Text_291B22, MSGBOX_DEFAULT
release
end
PetalburgCity_PokemonCenter_1F_EventScript_2915EB:: @ 82915EB
- msgbox PetalburgCity_PokemonCenter_1F_Text_291991, 4
+ msgbox PetalburgCity_PokemonCenter_1F_Text_291991, MSGBOX_DEFAULT
release
end
PetalburgCity_PokemonCenter_1F_EventScript_2915F5:: @ 82915F5
- msgbox PetalburgCity_PokemonCenter_1F_Text_291A1B, 4
+ msgbox PetalburgCity_PokemonCenter_1F_Text_291A1B, MSGBOX_DEFAULT
goto PetalburgCity_PokemonCenter_1F_EventScript_291603
end
PetalburgCity_PokemonCenter_1F_EventScript_291603:: @ 8291603
- msgbox PetalburgCity_PokemonCenter_1F_Text_291A4F, 4
+ msgbox PetalburgCity_PokemonCenter_1F_Text_291A4F, MSGBOX_DEFAULT
multichoice 17, 6, 20, 0
switch VAR_RESULT
case 0, PetalburgCity_PokemonCenter_1F_EventScript_291650
@@ -70,12 +70,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_291603:: @ 8291603
end
PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642
- msgbox PetalburgCity_PokemonCenter_1F_Text_291729, 4
+ msgbox PetalburgCity_PokemonCenter_1F_Text_291729, MSGBOX_DEFAULT
goto PetalburgCity_PokemonCenter_1F_EventScript_291603
end
PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650
- msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, 4
+ msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, 0
call PetalburgCity_PokemonCenter_1F_EventScript_271E7C
@@ -88,7 +88,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650
end
PetalburgCity_PokemonCenter_1F_EventScript_29167C:: @ 829167C
- msgbox PetalburgCity_PokemonCenter_1F_Text_291ABA, 4
+ msgbox PetalburgCity_PokemonCenter_1F_Text_291ABA, MSGBOX_DEFAULT
release
end
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 734831f7f..81ea87871 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -5,14 +5,14 @@ LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE
LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704
LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT
applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_27259E
waitmovement 0
compare VAR_0x8005, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_29274D
compare VAR_0x8005, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292758
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT
closemessage
setvar VAR_0x4092, 4
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292763
@@ -37,7 +37,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292763: @ 8292763
LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765
LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AF0
@@ -61,13 +61,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_292799:: @ 8292799
LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799
checkflag FLAG_0x051
goto_eq LittlerootTown_BrendansHouse_2F_EventScript_29283F
- msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, 4
+ msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT
call LittlerootTown_BrendansHouse_2F_EventScript_292849
delay 30
setvar VAR_0x4092, 6
setflag FLAG_0x051
- setflag FLAG_0x2F2
- setflag FLAG_0x2F3
+ setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1
+ setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2
checkplayergender
compare VAR_RESULT, 0
call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2927DF
@@ -85,7 +85,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF
waitmovement 0
applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8
waitmovement 0
- msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, 4
+ msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292857
waitmovement 0
@@ -98,7 +98,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F
waitmovement 0
applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A4
waitmovement 0
- msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, 4
+ msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292862
waitmovement 0
@@ -161,7 +161,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AE0
waitmovement 0
playbgm MUS_INTER_V, 0
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929B7
waitmovement 0
@@ -170,8 +170,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
call LittlerootTown_BrendansHouse_1F_EventScript_29296C
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4
waitmovement 0
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, 4
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
closemessage
setvar VAR_TEMP_1, 1
applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929BD
@@ -186,7 +186,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
applymovement 255, LittlerootTown_MaysHouse_1F_Movement_292AE8
waitmovement 0
playbgm MUS_INTER_V, 0
- msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, 4
+ msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929BA
waitmovement 0
@@ -195,8 +195,8 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
call LittlerootTown_MaysHouse_1F_EventScript_29296C
applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8
waitmovement 0
- msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, 4
- msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, 4
+ msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
+ msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
closemessage
setvar VAR_TEMP_1, 1
applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929C1
@@ -211,7 +211,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B
waitmovement 0
applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_27259A
waitmovement 0
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, MSGBOX_DEFAULT
closemessage
return
@@ -219,7 +219,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C
LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A6
waitmovement 0
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT
fadedefaultbgm
special TurnOffTVScreen
setflag FLAG_SYS_TV_HOME
@@ -326,23 +326,23 @@ LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94
compare VAR_0x4092, 7
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT
release
end
LittlerootTown_BrendansHouse_1F_EventScript_292A0F:: @ 8292A0F
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT
release
end
LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19
checkflag FLAG_0x0D8
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A43
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, MSGBOX_DEFAULT
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E89, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E89, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
@@ -358,22 +358,22 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A43:: @ 8292A43
LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51
checkflag FLAG_0x085
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT
giveitem_std ITEM_AMULET_COIN
compare VAR_RESULT, 0
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_272054
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT
setflag FLAG_0x085
release
end
LittlerootTown_BrendansHouse_1F_EventScript_292A86:: @ 8292A86
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D08, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D08, MSGBOX_DEFAULT
goto LittlerootTown_BrendansHouse_1F_EventScript_292A9E
end
LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CC3, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CC3, MSGBOX_DEFAULT
release
end
@@ -381,12 +381,12 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E
closemessage
call LittlerootTown_BrendansHouse_1F_EventScript_272083
incrementgamestat 16
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT
release
end
LittlerootTown_BrendansHouse_1F_EventScript_292AB0:: @ 8292AB0
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CD8, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CD8, MSGBOX_DEFAULT
release
end
@@ -396,7 +396,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292ABA:: @ 8292ABA
faceplayer
waitse
playmoncry SPECIES_VIGOROTH, 0
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EA8, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EA8, MSGBOX_DEFAULT
waitmoncry
release
end
@@ -407,7 +407,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292ACD:: @ 8292ACD
faceplayer
waitse
playmoncry SPECIES_VIGOROTH, 0
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EB3, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EB3, MSGBOX_DEFAULT
waitmoncry
release
end
@@ -464,16 +464,16 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C96
compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CA1
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, MSGBOX_DEFAULT
giveitem_std ITEM_SS_TICKET
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, MSGBOX_DEFAULT
closemessage
delay 20
compare VAR_0x8008, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CAC
compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CC1
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, MSGBOX_DEFAULT
closemessage
compare VAR_0x8008, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CD6
@@ -488,7 +488,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D5D
delay 20
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, MSGBOX_DEFAULT
closemessage
setflag FLAG_SYS_TV_LATI
special TurnOnTVScreen
@@ -497,13 +497,13 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D72
compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D7D
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, MSGBOX_DEFAULT
closemessage
compare VAR_0x8008, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D1E
compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D33
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT
closemessage
clearflag FLAG_SYS_TV_LATI
setflag FLAG_0x0FF
@@ -512,12 +512,12 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D88
compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D9D
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, MSGBOX_DEFAULT
multichoice 22, 8, 108, 1
copyvar VAR_0x8004, VAR_RESULT
special InitRoamer
copyvar VAR_0x40D5, VAR_RESULT
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT
closemessage
setvar VAR_0x4082, 4
setvar VAR_0x408C, 4
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 3187c95f4..324944bb1 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -247,24 +247,24 @@ LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4
EventScript_Pblock1_Ask:: @ 8293C3E
lockall
- checkflag FLAG_0x340
+ checkflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
goto_if 0, LilycoveCity_ContestLobby_EventScript_293EFB
setvar VAR_0x8009, 1
applymovement 16, LilycoveCity_ContestLobby_Movement_294053
waitmovement 0
- msgbox Text_Pblock1_Ask, 5
+ msgbox Text_Pblock1_Ask, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq EventScript_Pblock1_Yes
goto EventScript_Pblock1_No
end
EventScript_Pblock1_No: @ 8293C70
- msgbox Text_Pblock1_No, 4
+ msgbox Text_Pblock1_No, MSGBOX_DEFAULT
releaseall
end
EventScript_Pblock1_NoBerries: @ 8293C7A
- msgbox Text_Pblock1_NoBerries, 4
+ msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT
dodailyevents
checkflag FLAG_0x921
goto_eq LilycoveCity_ContestLobby_EventScript_293C92
@@ -272,31 +272,31 @@ EventScript_Pblock1_NoBerries: @ 8293C7A
end
LilycoveCity_ContestLobby_EventScript_293C92: @ 8293C92
- msgbox LilycoveCity_ContestLobby_Text_29307D, 4
+ msgbox LilycoveCity_ContestLobby_Text_29307D, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C
- msgbox LilycoveCity_ContestLobby_Text_292FD1, 4
+ msgbox LilycoveCity_ContestLobby_Text_292FD1, MSGBOX_DEFAULT
giveitem_std ITEM_PECHA_BERRY
setflag FLAG_0x921
goto EventScript_Pblock1_KnowHow
end
EventScript_Pblock1_KnowHow: @ 8293CB9
- msgbox Text_Pblock1_KnowHow, 5
+ msgbox Text_Pblock1_KnowHow, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq EventScript_Pblock1_Start
goto EventScript_Pblock1_Explain
end
EventScript_Pblock1_Start: @ 8293CD2
- msgbox Text_Pblock1_Start, 4
+ msgbox Text_Pblock1_Start, MSGBOX_DEFAULT
goto EventScript_StartBlending
end
EventScript_Pblock1_Explain: @ 8293CE0
- msgbox Text_Pblock1_Explain, 4
+ msgbox Text_Pblock1_Explain, MSGBOX_DEFAULT
goto EventScript_Pblock1_Start
end
@@ -310,7 +310,7 @@ EventScript_Pblock1_Yes: @ 8293CEE
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, 0
goto_eq EventScript_Pblock1_NoBerries
- msgbox Text_Pblock1_Yes, 4
+ msgbox Text_Pblock1_Yes, MSGBOX_DEFAULT
goto EventScript_Pblock1_KnowHow
end
@@ -323,12 +323,12 @@ EventScript_StartBlending: @ 8293D2C
end
EventScript_Pblock1_FullPokeblock: @ 8293D39
- msgbox Text_Pblock1_FullPokeblock, 4
+ msgbox Text_Pblock1_FullPokeblock, MSGBOX_DEFAULT
releaseall
end
EventScript_Pblock1_NoPokeblock: @ 8293D43
- msgbox Text_Pblock1_NoPokeblock, 4
+ msgbox Text_Pblock1_NoPokeblock, MSGBOX_DEFAULT
releaseall
end
@@ -338,36 +338,36 @@ LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D
applymovement 10, LilycoveCity_ContestLobby_Movement_2725A2
applymovement 3, LilycoveCity_ContestLobby_Movement_294053
waitmovement 0
- msgbox LilycoveCity_ContestLobby_Text_293201, 5
+ msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_293DC6
goto LilycoveCity_ContestLobby_EventScript_293D7D
end
LilycoveCity_ContestLobby_EventScript_293D7D: @ 8293D7D
- msgbox LilycoveCity_ContestLobby_Text_29323D, 4
+ msgbox LilycoveCity_ContestLobby_Text_29323D, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_293D87: @ 8293D87
- msgbox LilycoveCity_ContestLobby_Text_293394, 4
+ msgbox LilycoveCity_ContestLobby_Text_293394, MSGBOX_DEFAULT
release
end
LilycoveCity_ContestLobby_EventScript_293D91: @ 8293D91
- msgbox LilycoveCity_ContestLobby_Text_29328C, 5
+ msgbox LilycoveCity_ContestLobby_Text_29328C, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_293DAA
goto LilycoveCity_ContestLobby_EventScript_293DB8
end
LilycoveCity_ContestLobby_EventScript_293DAA: @ 8293DAA
- msgbox LilycoveCity_ContestLobby_Text_2932C3, 4
+ msgbox LilycoveCity_ContestLobby_Text_2932C3, MSGBOX_DEFAULT
goto EventScript_StartBlending
end
LilycoveCity_ContestLobby_EventScript_293DB8: @ 8293DB8
- msgbox LilycoveCity_ContestLobby_Text_2932F1, 4
+ msgbox LilycoveCity_ContestLobby_Text_2932F1, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_293DAA
end
@@ -378,7 +378,7 @@ LilycoveCity_ContestLobby_EventScript_293DC6: @ 8293DC6
checkitem ITEM_POKEBLOCK_CASE, 1
compare VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_293E14
- msgbox LilycoveCity_ContestLobby_Text_293237, 4
+ msgbox LilycoveCity_ContestLobby_Text_293237, MSGBOX_DEFAULT
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if 5, LilycoveCity_ContestLobby_EventScript_293D91
@@ -387,12 +387,12 @@ LilycoveCity_ContestLobby_EventScript_293DC6: @ 8293DC6
end
LilycoveCity_ContestLobby_EventScript_293E0A: @ 8293E0A
- msgbox LilycoveCity_ContestLobby_Text_29343E, 4
+ msgbox LilycoveCity_ContestLobby_Text_29343E, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_293E14: @ 8293E14
- msgbox LilycoveCity_ContestLobby_Text_2934A2, 4
+ msgbox LilycoveCity_ContestLobby_Text_2934A2, MSGBOX_DEFAULT
releaseall
end
@@ -404,36 +404,36 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E
applymovement 17, LilycoveCity_ContestLobby_Movement_2725A2
applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053
waitmovement 0
- msgbox LilycoveCity_ContestLobby_Text_293842, 5
+ msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_293EA3
goto LilycoveCity_ContestLobby_EventScript_293E5A
end
LilycoveCity_ContestLobby_EventScript_293E5A: @ 8293E5A
- msgbox LilycoveCity_ContestLobby_Text_293558, 4
+ msgbox LilycoveCity_ContestLobby_Text_293558, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_293E64: @ 8293E64
- msgbox LilycoveCity_ContestLobby_Text_29367D, 4
+ msgbox LilycoveCity_ContestLobby_Text_29367D, MSGBOX_DEFAULT
release
end
LilycoveCity_ContestLobby_EventScript_293E6E: @ 8293E6E
- msgbox LilycoveCity_ContestLobby_Text_29357E, 5
+ msgbox LilycoveCity_ContestLobby_Text_29357E, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_293E87
goto LilycoveCity_ContestLobby_EventScript_293E95
end
LilycoveCity_ContestLobby_EventScript_293E87: @ 8293E87
- msgbox LilycoveCity_ContestLobby_Text_2935B1, 4
+ msgbox LilycoveCity_ContestLobby_Text_2935B1, MSGBOX_DEFAULT
goto EventScript_StartBlending
end
LilycoveCity_ContestLobby_EventScript_293E95: @ 8293E95
- msgbox LilycoveCity_ContestLobby_Text_2935E5, 4
+ msgbox LilycoveCity_ContestLobby_Text_2935E5, MSGBOX_DEFAULT
goto LilycoveCity_ContestLobby_EventScript_293E87
end
@@ -444,7 +444,7 @@ LilycoveCity_ContestLobby_EventScript_293EA3: @ 8293EA3
checkitem ITEM_POKEBLOCK_CASE, 1
compare VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_293EF1
- msgbox LilycoveCity_ContestLobby_Text_29354E, 4
+ msgbox LilycoveCity_ContestLobby_Text_29354E, MSGBOX_DEFAULT
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if 5, LilycoveCity_ContestLobby_EventScript_293E6E
@@ -453,27 +453,27 @@ LilycoveCity_ContestLobby_EventScript_293EA3: @ 8293EA3
end
LilycoveCity_ContestLobby_EventScript_293EE7: @ 8293EE7
- msgbox LilycoveCity_ContestLobby_Text_293738, 4
+ msgbox LilycoveCity_ContestLobby_Text_293738, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_293EF1: @ 8293EF1
- msgbox LilycoveCity_ContestLobby_Text_293792, 4
+ msgbox LilycoveCity_ContestLobby_Text_293792, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_293EFB: @ 8293EFB
lockall
setvar VAR_0x8009, 1
- msgbox LilycoveCity_ContestLobby_Text_2C42F4, 5
+ msgbox LilycoveCity_ContestLobby_Text_2C42F4, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_293F28
- msgbox LilycoveCity_ContestLobby_Text_2C4332, 4
+ msgbox LilycoveCity_ContestLobby_Text_2C4332, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_293F1E: @ 8293F1E
- msgbox LilycoveCity_ContestLobby_Text_2C439D, 4
+ msgbox LilycoveCity_ContestLobby_Text_2C439D, MSGBOX_DEFAULT
releaseall
end
@@ -492,37 +492,37 @@ LilycoveCity_ContestLobby_EventScript_293F28: @ 8293F28
end
LilycoveCity_ContestLobby_EventScript_293F64: @ 8293F64
- msgbox LilycoveCity_ContestLobby_Text_2C43FA, 5
+ msgbox LilycoveCity_ContestLobby_Text_2C43FA, MSGBOX_YESNO
compare VAR_RESULT, 0
call_if 1, LilycoveCity_ContestLobby_EventScript_293F85
- msgbox LilycoveCity_ContestLobby_Text_2C451B, 4
+ msgbox LilycoveCity_ContestLobby_Text_2C451B, MSGBOX_DEFAULT
goto EventScript_StartBlending
end
LilycoveCity_ContestLobby_EventScript_293F85: @ 8293F85
- msgbox LilycoveCity_ContestLobby_Text_2C444C, 4
+ msgbox LilycoveCity_ContestLobby_Text_2C444C, MSGBOX_DEFAULT
return
LilycoveCity_ContestLobby_EventScript_293F8E: @ 8293F8E
- msgbox LilycoveCity_ContestLobby_Text_2C4573, 4
+ msgbox LilycoveCity_ContestLobby_Text_2C4573, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_293F98: @ 8293F98
- msgbox LilycoveCity_ContestLobby_Text_2C45E8, 4
+ msgbox LilycoveCity_ContestLobby_Text_2C45E8, MSGBOX_DEFAULT
releaseall
end
LilycoveCity_ContestLobby_EventScript_293FA2:: @ 8293FA2
- msgbox LilycoveCity_ContestLobby_Text_2937F9, 2
+ msgbox LilycoveCity_ContestLobby_Text_2937F9, MSGBOX_NPC
end
LilycoveCity_ContestLobby_EventScript_293FAB:: @ 8293FAB
- msgbox LilycoveCity_ContestLobby_Text_293842, 2
+ msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_NPC
end
LilycoveCity_ContestLobby_EventScript_293FB4:: @ 8293FB4
- msgbox LilycoveCity_ContestLobby_Text_29388F, 2
+ msgbox LilycoveCity_ContestLobby_Text_29388F, MSGBOX_NPC
end
LilycoveCity_ContestLobby_EventScript_293FBD:: @ 8293FBD
@@ -533,7 +533,7 @@ LilycoveCity_ContestLobby_EventScript_293FBD:: @ 8293FBD
LilycoveCity_ContestLobby_EventScript_293FC8: @ 8293FC8
lock
faceplayer
- msgbox Text_Pblock1_Talk_0, 4
+ msgbox Text_Pblock1_Talk_0, MSGBOX_DEFAULT
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_293FEE
@@ -542,7 +542,7 @@ LilycoveCity_ContestLobby_EventScript_293FC8: @ 8293FC8
end
LilycoveCity_ContestLobby_EventScript_293FEE: @ 8293FEE
- msgbox Text_Pblock1_Talk_1, 4
+ msgbox Text_Pblock1_Talk_1, MSGBOX_DEFAULT
release
end
@@ -560,15 +560,15 @@ LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8
end
LilycoveCity_ContestLobby_EventScript_294028: @ 8294028
- msgbox LilycoveCity_ContestLobby_Text_293BB4, 4
+ msgbox LilycoveCity_ContestLobby_Text_293BB4, MSGBOX_DEFAULT
release
end
LilycoveCity_ContestLobby_EventScript_294032: @ 8294032
- msgbox LilycoveCity_ContestLobby_Text_293AF0, 4
+ msgbox LilycoveCity_ContestLobby_Text_293AF0, MSGBOX_DEFAULT
giveitem_std ITEM_PECHA_BERRY
setflag FLAG_0x921
- msgbox LilycoveCity_ContestLobby_Text_293B76, 4
+ msgbox LilycoveCity_ContestLobby_Text_293B76, MSGBOX_DEFAULT
release
end
@@ -592,7 +592,7 @@ EventScript_PblockLink:: @ 8294055
end
EventScript_PblocLink_Ask: @ 8294092
- msgbox Text_PblockLink_Ask, 5
+ msgbox Text_PblockLink_Ask, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq EventScript_PblocLink_TryConnect
compare VAR_RESULT, 0
@@ -600,7 +600,7 @@ EventScript_PblocLink_Ask: @ 8294092
end
EventScript_PblocLink_NoBerries: @ 82940B1
- msgbox Text_PblockLink_NoBerries, 4
+ msgbox Text_PblockLink_NoBerries, MSGBOX_DEFAULT
releaseall
end
@@ -628,17 +628,17 @@ EventScript_PblocLink_TryConnect: @ 82940BB
end
EventScript_PblocLink_1Arrived: @ 829411D
- msgbox Text_PblockLink_1Arrived, 4
+ msgbox Text_PblockLink_1Arrived, MSGBOX_DEFAULT
goto EventScript_PblocLink_StartLinkBlending
end
EventScript_PblocLink_2Arrived: @ 829412B
- msgbox Text_PblockLink_2Arrived, 4
+ msgbox Text_PblockLink_2Arrived, MSGBOX_DEFAULT
goto EventScript_PblocLink_StartLinkBlending
end
EventScript_PblocLink_3Arrived: @ 8294139
- msgbox Text_PblockLink_3Arrived, 4
+ msgbox Text_PblockLink_3Arrived, MSGBOX_DEFAULT
goto EventScript_PblocLink_StartLinkBlending
end
@@ -659,36 +659,36 @@ EventScript_PblocLink_End: @ 8294160
end
EventScript_PblocLink_FullPokeblock: @ 8294162
- msgbox Text_PblockLink_FullPokeblock, 4
+ msgbox Text_PblockLink_FullPokeblock, MSGBOX_DEFAULT
releaseall
end
EventScript_PblocLink_NoPokeblock: @ 829416C
- msgbox Text_PblockLink_NoPokeblock, 4
+ msgbox Text_PblockLink_NoPokeblock, MSGBOX_DEFAULT
releaseall
end
EventScript_PblocLink_SomeoneNotReady: @ 8294176
special CloseLink
- msgbox LilycoveCity_ContestLobby_Text_2781C7, 4
+ msgbox LilycoveCity_ContestLobby_Text_2781C7, MSGBOX_DEFAULT
releaseall
end
EventScript_PblocLink_DifferentSelections: @ 8294183
special CloseLink
- msgbox LilycoveCity_ContestLobby_Text_278255, 4
+ msgbox LilycoveCity_ContestLobby_Text_278255, MSGBOX_DEFAULT
releaseall
end
EventScript_PblocLink_CloseLink: @ 8294190
special CloseLink
- msgbox gUnknown_08272D9C, 4
+ msgbox gUnknown_08272D9C, MSGBOX_DEFAULT
releaseall
end
EventScript_PblocLink_LinkError: @ 829419D
special CloseLink
- msgbox LilycoveCity_ContestLobby_Text_27821C, 4
+ msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT
releaseall
end
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index e4b1fce41..84bb3982d 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -13,7 +13,7 @@ EventScript_2A4B5D:: @ 82A4B5D
EventScript_2A4B6F:: @ 82A4B6F
lockall
- msgbox Text_2A4BF4, 5
+ msgbox Text_2A4BF4, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq EventScript_2A4B85
releaseall
@@ -45,7 +45,7 @@ EventScript_2A4BAC:: @ 82A4BAC
special GetPokeblockFeederInFront
compare VAR_RESULT, 65535
goto_if 5, EventScript_2A4BEB
- msgbox Text_2A4C90, 5
+ msgbox Text_2A4C90, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq EventScript_2A4BD0
releaseall
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index 33e7f2e5b..aa1f4afee 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -36,10 +36,10 @@ Route111_Text_27659D: @ 827659D
Route111_EventScript_2765FF:: @ 82765FF
lock
faceplayer
- msgbox Route111_Text_2762C9, 5
+ msgbox Route111_Text_2762C9, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq Route111_EventScript_27661E
- msgbox Route111_Text_27655C, 4
+ msgbox Route111_Text_27655C, MSGBOX_DEFAULT
release
end
@@ -47,10 +47,10 @@ Route111_EventScript_27661E:: @ 827661E
giveitem_std ITEM_TM43
compare VAR_RESULT, 0
goto_eq Route111_EventScript_276680
- msgbox Route111_Text_27636E, 4
+ msgbox Route111_Text_27636E, MSGBOX_DEFAULT
closemessage
setflag FLAG_0x060
- clearflag FLAG_0x3B4
+ clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN
compare VAR_FACING, 3
call_if 1, Route111_EventScript_27666A
compare VAR_FACING, 4
@@ -72,7 +72,7 @@ Route111_EventScript_276675:: @ 8276675
return
Route111_EventScript_276680:: @ 8276680
- msgbox Route111_Text_27659D, 4
+ msgbox Route111_Text_27659D, MSGBOX_DEFAULT
release
end
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index 2292e9984..9033e741f 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -32,18 +32,18 @@ EventScript_27EE54:: @ 827EE54
EventScript_27EE8A:: @ 827EE8A
special GetMomOrDadStringForTVMessage
- msgbox gUnknown_08272BCF, 4
+ msgbox gUnknown_08272BCF, MSGBOX_DEFAULT
special TurnOffTVScreen
releaseall
end
EventScript_27EE9A:: @ 827EE9A
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F0F, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F0F, MSGBOX_DEFAULT
releaseall
end
EventScript_27EEA4:: @ 827EEA4
- msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, 4
+ msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT
special InitRoamer
clearflag FLAG_SYS_TV_LATI
setflag FLAG_0x0FF
@@ -68,7 +68,7 @@ EventScript_27EED0:: @ 827EED0
EventScript_27EED8:: @ 827EED8
special GetMomOrDadStringForTVMessage
- msgbox gUnknown_08272BCF, 4
+ msgbox gUnknown_08272BCF, MSGBOX_DEFAULT
goto EventScript_27EED0
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-20 12:45:03 +0000