diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 01:45:31 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 03:00:38 -0500 |
| commit | 29e4446a03b83a822f5dd8b11b60728cadbcb0f6 (patch) | |
| tree | 9df3d7a9954f87850907668bc60189c07c6eb84f | |
| parent | 4a6f15ba24c159ad6cc1be1d7c8c636e416e80d6 (diff) | |
Use MSGBOX constants
261 files changed, 844 insertions, 844 deletions
diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index ba8a9fa51..225feeff6 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -7,7 +7,7 @@ CeladonCity_OnTransition:: @ 8166C95 end CeladonCity_EventScript_166C99:: @ 8166C99 - msgbox gUnknown_817FEC3, 2 + msgbox gUnknown_817FEC3, MSGBOX_NPC end CeladonCity_EventScript_166CA2:: @ 8166CA2 @@ -17,11 +17,11 @@ CeladonCity_EventScript_166CA2:: @ 8166CA2 end CeladonCity_EventScript_166CAD:: @ 8166CAD - msgbox gUnknown_817FF4A, 2 + msgbox gUnknown_817FF4A, MSGBOX_NPC end CeladonCity_EventScript_166CB6:: @ 8166CB6 - msgbox gUnknown_817FFC5, 2 + msgbox gUnknown_817FFC5, MSGBOX_NPC end CeladonCity_EventScript_166CBF:: @ 8166CBF @@ -52,27 +52,27 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC end CeladonCity_EventScript_166CFA:: @ 8166CFA - msgbox gUnknown_81800C2, 2 + msgbox gUnknown_81800C2, MSGBOX_NPC end CeladonCity_EventScript_166D03:: @ 8166D03 - msgbox gUnknown_818008C, 2 + msgbox gUnknown_818008C, MSGBOX_NPC end CeladonCity_EventScript_166D0C:: @ 8166D0C - msgbox gUnknown_8180300, 2 + msgbox gUnknown_8180300, MSGBOX_NPC end CeladonCity_EventScript_166D15:: @ 8166D15 - msgbox gUnknown_81804E1, 2 + msgbox gUnknown_81804E1, MSGBOX_NPC end CeladonCity_EventScript_166D1E:: @ 8166D1E - msgbox gUnknown_81800E1, 3 + msgbox gUnknown_81800E1, MSGBOX_SIGN end CeladonCity_EventScript_166D27:: @ 8166D27 - msgbox gUnknown_818017A, 3 + msgbox gUnknown_818017A, MSGBOX_SIGN end CeladonCity_EventScript_166D30:: @ 8166D30 @@ -83,21 +83,21 @@ CeladonCity_EventScript_166D30:: @ 8166D30 end CeladonCity_EventScript_166D48:: @ 8166D48 - msgbox gUnknown_81801E5, 3 + msgbox gUnknown_81801E5, MSGBOX_SIGN end CeladonCity_EventScript_166D51:: @ 8166D51 - msgbox gUnknown_81801F5, 3 + msgbox gUnknown_81801F5, MSGBOX_SIGN end CeladonCity_EventScript_166D5A:: @ 8166D5A - msgbox gUnknown_8180224, 3 + msgbox gUnknown_8180224, MSGBOX_SIGN end CeladonCity_EventScript_166D63:: @ 8166D63 - msgbox gUnknown_81802A4, 3 + msgbox gUnknown_81802A4, MSGBOX_SIGN end CeladonCity_EventScript_166D6C:: @ 8166D6C - msgbox gUnknown_81802CF, 3 + msgbox gUnknown_81802CF, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index f5afb1851..2842caec7 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -59,5 +59,5 @@ CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4 end CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7 - msgbox gUnknown_8196287, 3 + msgbox gUnknown_8196287, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_2F/scripts.inc b/data/maps/CeladonCity_Condominiums_2F/scripts.inc index cab71a823..53c0a90c0 100644 --- a/data/maps/CeladonCity_Condominiums_2F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_2F/scripts.inc @@ -2,5 +2,5 @@ CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0 .byte 0 CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1 - msgbox gUnknown_81962A7, 3 + msgbox gUnknown_81962A7, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index e8d1bef2b..dfa1836f0 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -2,15 +2,15 @@ CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA .byte 0 CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB - msgbox gUnknown_81962BF, 2 + msgbox gUnknown_81962BF, MSGBOX_NPC end CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4 - msgbox gUnknown_81962D7, 2 + msgbox gUnknown_81962D7, MSGBOX_NPC end CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED - msgbox gUnknown_81962FB, 2 + msgbox gUnknown_81962FB, MSGBOX_NPC end CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 @@ -40,17 +40,17 @@ EventScript_16C418:: @ 816C418 end CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435 - msgbox gUnknown_81964A8, 3 + msgbox gUnknown_81964A8, MSGBOX_SIGN end CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E - msgbox gUnknown_819640C, 3 + msgbox gUnknown_819640C, MSGBOX_SIGN end CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447 - msgbox gUnknown_819644B, 3 + msgbox gUnknown_819644B, MSGBOX_SIGN end CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450 - msgbox gUnknown_8196478, 3 + msgbox gUnknown_8196478, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc index a074d5778..59631d86c 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc @@ -2,5 +2,5 @@ CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459 .byte 0 CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A - msgbox gUnknown_81964C4, 3 + msgbox gUnknown_81964C4, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 4271cff79..4e9d2b7ae 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -2,7 +2,7 @@ CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463 .byte 0 CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464 - msgbox gUnknown_81964D7, 2 + msgbox gUnknown_81964D7, MSGBOX_NPC end CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D @@ -27,7 +27,7 @@ EventScript_16C4A6:: @ 816C4A6 waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16C514 call EventScript_1A8C27 call EventScript_1A74EB @@ -42,7 +42,7 @@ EventScript_16C4DA:: @ 816C4DA waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16C509 call EventScript_1A8C33 goto EventScript_16C509 @@ -59,7 +59,7 @@ EventScript_16C514:: @ 816C514 end CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519 - msgbox gUnknown_81967E3, 3 + msgbox gUnknown_81967E3, MSGBOX_SIGN end CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 diff --git a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc index 593bf0016..4e5bcc05e 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc @@ -2,13 +2,13 @@ CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8 .byte 0 CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9 - msgbox gUnknown_81954DD, 2 + msgbox gUnknown_81954DD, MSGBOX_NPC end CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2 - msgbox gUnknown_8195537, 3 + msgbox gUnknown_8195537, MSGBOX_SIGN end CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB - msgbox gUnknown_81955B3, 3 + msgbox gUnknown_81955B3, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 24cc47519..b9c3b056e 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -2,15 +2,15 @@ CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4 .byte 0 CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5 - msgbox gUnknown_81955C7, 2 + msgbox gUnknown_81955C7, MSGBOX_NPC end CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE - msgbox gUnknown_819560F, 2 + msgbox gUnknown_819560F, MSGBOX_NPC end CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 - msgbox gUnknown_8195638, 3 + msgbox gUnknown_8195638, MSGBOX_SIGN end CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc index 0ce4515d2..46b2ebf4e 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc @@ -6,45 +6,45 @@ CeladonCity_DepartmentStore_3F_EventScript_16BB85:: @ 816BB85 end CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B - msgbox gUnknown_81956E9, 2 + msgbox gUnknown_81956E9, MSGBOX_NPC end CeladonCity_DepartmentStore_3F_EventScript_16BB94:: @ 816BB94 - msgbox gUnknown_8195769, 2 + msgbox gUnknown_8195769, MSGBOX_NPC end CeladonCity_DepartmentStore_3F_EventScript_16BB9D:: @ 816BB9D - msgbox gUnknown_81957B0, 2 + msgbox gUnknown_81957B0, MSGBOX_NPC end CeladonCity_DepartmentStore_3F_EventScript_16BBA6:: @ 816BBA6 - msgbox gUnknown_8195823, 2 + msgbox gUnknown_8195823, MSGBOX_NPC end CeladonCity_DepartmentStore_3F_EventScript_16BBAF:: @ 816BBAF - msgbox gUnknown_8195863, 3 + msgbox gUnknown_8195863, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBB8:: @ 816BBB8 - msgbox gUnknown_8195875, 3 + msgbox gUnknown_8195875, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBC1:: @ 816BBC1 - msgbox gUnknown_8195897, 3 + msgbox gUnknown_8195897, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBCA:: @ 816BBCA - msgbox gUnknown_81958B8, 3 + msgbox gUnknown_81958B8, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBD3:: @ 816BBD3 - msgbox gUnknown_81958D8, 3 + msgbox gUnknown_81958D8, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC - msgbox gUnknown_81958F6, 3 + msgbox gUnknown_81958F6, MSGBOX_SIGN end CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5 - msgbox gUnknown_8195907, 3 + msgbox gUnknown_8195907, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index 57d7469a6..6844069bf 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -2,15 +2,15 @@ CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE .byte 0 CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF - msgbox gUnknown_8195A68, 2 + msgbox gUnknown_8195A68, MSGBOX_NPC end CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8 - msgbox gUnknown_8195AC9, 2 + msgbox gUnknown_8195AC9, MSGBOX_NPC end CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 - msgbox gUnknown_8195B5B, 3 + msgbox gUnknown_8195B5B, MSGBOX_SIGN end CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 88aced082..71a190c86 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -2,15 +2,15 @@ CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40 .byte 0 CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41 - msgbox gUnknown_8195BBA, 2 + msgbox gUnknown_8195BBA, MSGBOX_NPC end CeladonCity_DepartmentStore_5F_EventScript_16BC4A:: @ 816BC4A - msgbox gUnknown_8195CA0, 2 + msgbox gUnknown_8195CA0, MSGBOX_NPC end CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 - msgbox gUnknown_8195D14, 3 + msgbox gUnknown_8195D14, MSGBOX_SIGN end CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index e6341f5d9..a39810d94 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -41,7 +41,7 @@ EventScript_16BD38:: @ 816BD38 EventScript_16BD3E:: @ 816BD3E msgbox gUnknown_8195D22, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16C00C textcolor 3 message Text_195D5F @@ -201,11 +201,11 @@ EventScript_16C018:: @ 816C018 end CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022 - msgbox gUnknown_8195F98, 2 + msgbox gUnknown_8195F98, MSGBOX_NPC end CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B - msgbox gUnknown_8196017, 3 + msgbox gUnknown_8196017, MSGBOX_SIGN end CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 17756a332..3e4f49fe5 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -15,7 +15,7 @@ EventScript_16C656:: @ 816C656 return CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 - msgbox gUnknown_8196940, 2 + msgbox gUnknown_8196940, MSGBOX_NPC end CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D @@ -254,7 +254,7 @@ EventScript_16C96A:: @ 816C96A EventScript_16C96C:: @ 816C96C goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16C96A setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 @@ -417,7 +417,7 @@ EventScript_16CABE:: @ 816CABE CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, Text_196E69, Text_196E95, EventScript_16CB10 - msgbox gUnknown_8196E9B, 6 + msgbox gUnknown_8196E9B, MSGBOX_AUTOCLOSE end EventScript_16CB10:: @ 816CB10 @@ -462,13 +462,13 @@ Movement_16CB53:: @ 816CB53 step_end CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A - msgbox gUnknown_8196F64, 3 + msgbox gUnknown_8196F64, MSGBOX_SIGN end CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63 - msgbox gUnknown_8196F81, 3 + msgbox gUnknown_8196F81, MSGBOX_SIGN end CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C - msgbox gUnknown_8196FA0, 3 + msgbox gUnknown_8196FA0, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 7eb986640..663a3a4f1 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -2,11 +2,11 @@ CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75 .byte 0 CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76 - msgbox gUnknown_8196FC1, 2 + msgbox gUnknown_8196FC1, MSGBOX_NPC end CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F - msgbox gUnknown_8196FFF, 2 + msgbox gUnknown_8196FFF, MSGBOX_NPC end CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 @@ -108,7 +108,7 @@ EventScript_16CC55:: @ 816CC55 EventScript_16CC65:: @ 816CC65 getspeciesname 0, VAR_TEMP_1 msgbox gUnknown_819709D, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16CC10 checkcoins VAR_RESULT compare VAR_RESULT, VAR_TEMP_2 @@ -221,7 +221,7 @@ EventScript_16CDB3:: @ 816CDB3 waitmessage waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16CD83 goto EventScript_16CC10 end @@ -235,7 +235,7 @@ EventScript_16CDE0:: @ 816CDE0 waitmessage waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16CE12 call EventScript_1A8C33 goto EventScript_16CE12 @@ -309,7 +309,7 @@ EventScript_16CEF5:: @ 816CEF5 EventScript_16CF09:: @ 816CF09 msgbox gUnknown_81970B2, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16CC10 goto EventScript_16CF3F end @@ -317,7 +317,7 @@ EventScript_16CF09:: @ 816CF09 EventScript_16CF22:: @ 816CF22 getitemname 0, VAR_TEMP_1 msgbox gUnknown_819709D, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16CC10 goto EventScript_16CF3F end diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 4948ace5f..e280f1a51 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -37,39 +37,39 @@ EventScript_16D107:: @ 816D107 CeladonCity_Gym_EventScript_16D111:: @ 816D111 trainerbattle_single TRAINER_LASS_KAY, Text_19747C, Text_1974C4 - msgbox gUnknown_81974D6, 6 + msgbox gUnknown_81974D6, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D128:: @ 816D128 trainerbattle_single TRAINER_LASS_LISA, Text_1976C5, Text_1976FF famechecker FAMECHECKER_ERIKA, 2 - msgbox gUnknown_8197708, 6 + msgbox gUnknown_8197708, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D14C:: @ 816D14C trainerbattle_single TRAINER_PICNICKER_TINA, Text_197595, Text_1975BB - msgbox gUnknown_81975D1, 6 + msgbox gUnknown_81975D1, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D163:: @ 816D163 trainerbattle_single TRAINER_BEAUTY_BRIDGET, Text_1974FA, Text_19751C - msgbox gUnknown_8197527, 6 + msgbox gUnknown_8197527, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D17A:: @ 816D17A trainerbattle_single TRAINER_BEAUTY_TAMIA, Text_19760B, Text_197660 famechecker FAMECHECKER_ERIKA, 3 - msgbox gUnknown_8197664, 6 + msgbox gUnknown_8197664, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D19E:: @ 816D19E trainerbattle_single TRAINER_BEAUTY_LORI, Text_197747, Text_19777A - msgbox gUnknown_8197788, 6 + msgbox gUnknown_8197788, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 trainerbattle_single TRAINER_COOLTRAINER_MARY, Text_1977E5, Text_197832 - msgbox gUnknown_819783E, 6 + msgbox gUnknown_819783E, MSGBOX_AUTOCLOSE end CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC diff --git a/data/maps/CeladonCity_Hotel/scripts.inc b/data/maps/CeladonCity_Hotel/scripts.inc index 39326647a..4f136bad3 100644 --- a/data/maps/CeladonCity_Hotel/scripts.inc +++ b/data/maps/CeladonCity_Hotel/scripts.inc @@ -2,17 +2,17 @@ CeladonCity_Hotel_MapScripts:: @ 816D283 .byte 0 CeladonCity_Hotel_EventScript_16D284:: @ 816D284 - msgbox gUnknown_8197B77, 2 + msgbox gUnknown_8197B77, MSGBOX_NPC end CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D - msgbox gUnknown_8197BBE, 2 + msgbox gUnknown_8197BBE, MSGBOX_NPC end CeladonCity_Hotel_EventScript_16D296:: @ 816D296 - msgbox gUnknown_8197C0C, 2 + msgbox gUnknown_8197C0C, MSGBOX_NPC end CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F - msgbox gUnknown_8197C30, 2 + msgbox gUnknown_8197C30, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_House1/scripts.inc b/data/maps/CeladonCity_House1/scripts.inc index be1415217..6c8dab4ff 100644 --- a/data/maps/CeladonCity_House1/scripts.inc +++ b/data/maps/CeladonCity_House1/scripts.inc @@ -2,13 +2,13 @@ CeladonCity_House1_MapScripts:: @ 816D267 .byte 0 CeladonCity_House1_EventScript_16D268:: @ 816D268 - msgbox gUnknown_8197A9F, 2 + msgbox gUnknown_8197A9F, MSGBOX_NPC end CeladonCity_House1_EventScript_16D271:: @ 816D271 - msgbox gUnknown_8197AD3, 2 + msgbox gUnknown_8197AD3, MSGBOX_NPC end CeladonCity_House1_EventScript_16D27A:: @ 816D27A - msgbox gUnknown_8197B20, 2 + msgbox gUnknown_8197B20, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index 1d7318ac7..943d1e396 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB end CeladonCity_PokemonCenter_1F_EventScript_16C604:: @ 816C604 - msgbox gUnknown_819685B, 2 + msgbox gUnknown_819685B, MSGBOX_NPC end CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D - msgbox gUnknown_81968C2, 2 + msgbox gUnknown_81968C2, MSGBOX_NPC end CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616 - msgbox gUnknown_8196913, 2 + msgbox gUnknown_8196913, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index d6ba4496c..760624c64 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -2,11 +2,11 @@ CeladonCity_Restaurant_MapScripts:: @ 816D1EA .byte 0 CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB - msgbox gUnknown_81978E6, 2 + msgbox gUnknown_81978E6, MSGBOX_NPC end CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4 - msgbox gUnknown_8197915, 2 + msgbox gUnknown_8197915, MSGBOX_NPC end CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD @@ -33,9 +33,9 @@ EventScript_16D24B:: @ 816D24B end CeladonCity_Restaurant_EventScript_16D255:: @ 816D255 - msgbox gUnknown_8197952, 2 + msgbox gUnknown_8197952, MSGBOX_NPC end CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E - msgbox gUnknown_819798A, 2 + msgbox gUnknown_819798A, MSGBOX_NPC end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index ef102064b..a266a6c93 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -255,15 +255,15 @@ EventScript_166713:: @ 8166713 end CeruleanCity_EventScript_16671D:: @ 816671D - msgbox gUnknown_817F0B2, 2 + msgbox gUnknown_817F0B2, MSGBOX_NPC end CeruleanCity_EventScript_166726:: @ 8166726 - msgbox gUnknown_817EF3F, 2 + msgbox gUnknown_817EF3F, MSGBOX_NPC end CeruleanCity_EventScript_16672F:: @ 816672F - msgbox gUnknown_817F319, 2 + msgbox gUnknown_817F319, MSGBOX_NPC end CeruleanCity_EventScript_166738:: @ 8166738 @@ -357,15 +357,15 @@ EventScript_16682F:: @ 816682F return CeruleanCity_EventScript_166838:: @ 8166838 - msgbox gUnknown_817F420, 3 + msgbox gUnknown_817F420, MSGBOX_SIGN end CeruleanCity_EventScript_166841:: @ 8166841 - msgbox gUnknown_817F453, 3 + msgbox gUnknown_817F453, MSGBOX_SIGN end CeruleanCity_EventScript_16684A:: @ 816684A - msgbox gUnknown_817F4C5, 3 + msgbox gUnknown_817F4C5, MSGBOX_SIGN end CeruleanCity_EventScript_166853:: @ 8166853 diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 9c137f644..88c8108cc 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -48,7 +48,7 @@ EventScript_16AC62:: @ 816AC62 end CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C - msgbox gUnknown_81928CF, 2 + msgbox gUnknown_81928CF, MSGBOX_NPC end CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75 @@ -66,5 +66,5 @@ EventScript_16AC8A:: @ 816AC8A CeruleanCity_BikeShop_EventScript_16AC94:: @ 816AC94 CeruleanCity_EventScript_16AC94:: @ 816AC94 - msgbox gUnknown_81929AD, 3 + msgbox gUnknown_81929AD, MSGBOX_SIGN end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index 0da4f93a7..1d2c46416 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -36,13 +36,13 @@ EventScript_16AB3A:: @ 816AB3A CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44 trainerbattle_single TRAINER_PICNICKER_DIANA, Text_192481, Text_1924D0 - msgbox gUnknown_81924E4, 6 + msgbox gUnknown_81924E4, MSGBOX_AUTOCLOSE end CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B trainerbattle_single TRAINER_SWIMMER_MALE_LUIS, Text_192524, Text_192547 famechecker FAMECHECKER_MISTY, 2 - msgbox gUnknown_8192556, 6 + msgbox gUnknown_8192556, MSGBOX_AUTOCLOSE end CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F diff --git a/data/maps/CeruleanCity_House2/scripts.inc b/data/maps/CeruleanCity_House2/scripts.inc index 630b4b919..1ebae8838 100644 --- a/data/maps/CeruleanCity_House2/scripts.inc +++ b/data/maps/CeruleanCity_House2/scripts.inc @@ -15,9 +15,9 @@ EventScript_16A98B:: @ 816A98B end CeruleanCity_House2_EventScript_16A995:: @ 816A995 - msgbox gUnknown_8191F2A, 2 + msgbox gUnknown_8191F2A, MSGBOX_NPC end CeruleanCity_House2_EventScript_16A99E:: @ 816A99E - msgbox gUnknown_8191F64, 3 + msgbox gUnknown_8191F64, MSGBOX_SIGN end diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index 9d02b8743..ce76ef039 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -2,7 +2,7 @@ CeruleanCity_House3_MapScripts:: @ 816A9A7 .byte 0 CeruleanCity_House3_EventScript_16A9A8:: @ 816A9A8 - msgbox gUnknown_8191F80, 2 + msgbox gUnknown_8191F80, MSGBOX_NPC end CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 @@ -12,7 +12,7 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 call EventScript_1A8CAD goto_if_set FLAG_DID_ZYNX_TRADE, EventScript_16AA23 msgbox gUnknown_81A59FE, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16AA0B call EventScript_1A8CBD compare VAR_0x8004, 6 diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 3a37f94be..b4c8b16be 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -6,7 +6,7 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 faceplayer goto_if_set FLAG_GOT_POWDER_JAR, EventScript_16AEB7 msgbox gUnknown_8192F67, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16AEAD goto_if_unset FLAG_SYS_GOT_BERRY_POUCH, EventScript_16AEA3 msgbox gUnknown_8193003 @@ -141,7 +141,7 @@ EventScript_16B048:: @ 816B048 EventScript_16B055:: @ 816B055 msgbox gUnknown_819331E, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16AEC8 copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_815EEB0 @@ -154,7 +154,7 @@ EventScript_16B055:: @ 816B055 special sub_815EF5C special sub_815F070 msgbox gUnknown_819337A, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16AEC8 msgbox gUnknown_81933FB special sub_815F114 diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index d51b2f96e..4008c5dd2 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -2,11 +2,11 @@ CeruleanCity_Mart_MapScripts:: @ 816AC9D .byte 0 CeruleanCity_Mart_EventScript_16AC9E:: @ 816AC9E - msgbox gUnknown_81929C2, 2 + msgbox gUnknown_81929C2, MSGBOX_NPC end CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7 - msgbox gUnknown_8192A79, 2 + msgbox gUnknown_8192A79, MSGBOX_NPC end CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index 01d9dfd82..f7b309f3e 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -15,11 +15,11 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA3C:: @ 816AA3C end CeruleanCity_PokemonCenter_1F_EventScript_16AA45:: @ 816AA45 - msgbox gUnknown_8192079, 2 + msgbox gUnknown_8192079, MSGBOX_NPC end CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E - msgbox gUnknown_8191FFB, 2 + msgbox gUnknown_8191FFB, MSGBOX_NPC end CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57 @@ -31,5 +31,5 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57 end CeruleanCity_PokemonCenter_1F_EventScript_16AA70:: @ 816AA70 - msgbox gUnknown_819214C, 2 + msgbox gUnknown_819214C, MSGBOX_NPC end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 9c07369b7..b3cd646b4 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -103,9 +103,9 @@ EventScript_166FCD:: @ 8166FCD call_if_set FLAG_TEMP_2, EventScript_167053 msgbox gUnknown_8180C90 msgbox gUnknown_8180CAA, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_167068 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_167078 end @@ -337,15 +337,15 @@ CinnabarIsland_EventScript_1671EF:: @ 81671EF end CinnabarIsland_EventScript_167208:: @ 8167208 - msgbox gUnknown_8180BA0, 2 + msgbox gUnknown_8180BA0, MSGBOX_NPC end CinnabarIsland_EventScript_167211:: @ 8167211 - msgbox gUnknown_8180C0D, 3 + msgbox gUnknown_8180C0D, MSGBOX_SIGN end CinnabarIsland_EventScript_16721A:: @ 816721A - msgbox gUnknown_8180C3E, 3 + msgbox gUnknown_8180C3E, MSGBOX_SIGN end CinnabarIsland_EventScript_167223:: @ 8167223 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 2de722229..c475e3c2a 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -82,12 +82,12 @@ EventScript_16DA75:: @ 816DA75 CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F trainerbattle_single TRAINER_SUPER_NERD_ERIK, Text_1997A5, Text_1997D6 - msgbox gUnknown_81997EA, 6 + msgbox gUnknown_81997EA, MSGBOX_AUTOCLOSE end CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 trainerbattle_single TRAINER_SUPER_NERD_AVERY, Text_1998BD, Text_1998ED, EventScript_16DAB1 - msgbox gUnknown_8199911, 6 + msgbox gUnknown_8199911, MSGBOX_AUTOCLOSE end EventScript_16DAB1:: @ 816DAB1 @@ -102,7 +102,7 @@ EventScript_16DABC:: @ 816DABC CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 trainerbattle_single TRAINER_SUPER_NERD_DEREK, Text_1999B7, Text_1999DB, EventScript_16DAEA famechecker FAMECHECKER_BLAINE, 2 - msgbox gUnknown_81999DF, 6 + msgbox gUnknown_81999DF, MSGBOX_AUTOCLOSE end EventScript_16DAEA:: @ 816DAEA @@ -116,7 +116,7 @@ EventScript_16DAF5:: @ 816DAF5 CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB trainerbattle_single TRAINER_SUPER_NERD_ZAC, Text_199AFC, Text_199B16, EventScript_16DB16 - msgbox gUnknown_8199B27, 6 + msgbox gUnknown_8199B27, MSGBOX_AUTOCLOSE end EventScript_16DB16:: @ 816DB16 @@ -130,7 +130,7 @@ EventScript_16DB21:: @ 816DB21 CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 trainerbattle_single TRAINER_BURGLAR_QUINN, Text_19983F, Text_199870, EventScript_16DB42 - msgbox gUnknown_819987D, 6 + msgbox gUnknown_819987D, MSGBOX_AUTOCLOSE end EventScript_16DB42:: @ 816DB42 @@ -144,7 +144,7 @@ EventScript_16DB4D:: @ 816DB4D CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 trainerbattle_single TRAINER_BURGLAR_RAMON, Text_199948, Text_199973, EventScript_16DB6E - msgbox gUnknown_8199986, 6 + msgbox gUnknown_8199986, MSGBOX_AUTOCLOSE end EventScript_16DB6E:: @ 816DB6E @@ -158,7 +158,7 @@ EventScript_16DB79:: @ 816DB79 CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F trainerbattle_single TRAINER_BURGLAR_DUSTY, Text_199A7F, Text_199AB9, EventScript_16DB9A - msgbox gUnknown_8199AC9, 6 + msgbox gUnknown_8199AC9, MSGBOX_AUTOCLOSE end EventScript_16DB9A:: @ 816DB9A @@ -210,9 +210,9 @@ CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4 EventScript_16DC00:: @ 816DC00 msgbox gUnknown_8199C9F msgbox gUnknown_8199D5A, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16DC43 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16DC6A end @@ -305,9 +305,9 @@ CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9 EventScript_16DCF5:: @ 816DCF5 msgbox gUnknown_8199C9F msgbox gUnknown_8199D79, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16DD41 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16DD1C end @@ -391,9 +391,9 @@ CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7 EventScript_16DDD3:: @ 816DDD3 msgbox gUnknown_8199C9F msgbox gUnknown_8199DA9, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16DE1F - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16DDFA end @@ -468,9 +468,9 @@ CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E EventScript_16DEAA:: @ 816DEAA msgbox gUnknown_8199C9F msgbox gUnknown_8199DC6, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16DEF6 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16DED1 end @@ -545,9 +545,9 @@ CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75 EventScript_16DF81:: @ 816DF81 msgbox gUnknown_8199C9F msgbox gUnknown_8199E00, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16DFA8 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16DFCD end @@ -622,9 +622,9 @@ CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C EventScript_16E058:: @ 816E058 msgbox gUnknown_8199C9F msgbox gUnknown_8199E36, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16E0A4 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E07F end diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index 75dc94f46..7893e41bc 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -2,11 +2,11 @@ CinnabarIsland_Mart_MapScripts:: @ 816EA0F .byte 0 CinnabarIsland_Mart_EventScript_16EA10:: @ 816EA10 - msgbox gUnknown_819A7A0, 2 + msgbox gUnknown_819A7A0, MSGBOX_NPC end CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 - msgbox gUnknown_819A7F1, 2 + msgbox gUnknown_819A7F1, MSGBOX_NPC end CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 3fc84f92f..c3137faec 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -15,22 +15,22 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E8E6:: @ 816E8E6 end CinnabarIsland_PokemonCenter_1F_EventScript_16E8EF:: @ 816E8EF - msgbox gUnknown_819A5BE, 2 + msgbox gUnknown_819A5BE, MSGBOX_NPC end CinnabarIsland_PokemonCenter_1F_EventScript_16E8F8:: @ 816E8F8 - msgbox gUnknown_819A4F8, 2 + msgbox gUnknown_819A4F8, MSGBOX_NPC end CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901 - msgbox gUnknown_819A6B1, 2 + msgbox gUnknown_819A6B1, MSGBOX_NPC end CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A lock faceplayer msgbox gUnknown_819A725, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E9A5 msgbox gUnknown_819A785 closemessage diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index d11407f14..caf07f29d 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -12,21 +12,21 @@ EventScript_16E285:: @ 816E285 return CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B - msgbox gUnknown_8199EE5, 2 + msgbox gUnknown_8199EE5, MSGBOX_NPC end CinnabarIsland_PokemonLab_Entrance_EventScript_16E294:: @ 816E294 - msgbox gUnknown_8199F41, 3 + msgbox gUnknown_8199F41, MSGBOX_SIGN end CinnabarIsland_PokemonLab_Entrance_EventScript_16E29D:: @ 816E29D - msgbox gUnknown_8199F6A, 3 + msgbox gUnknown_8199F6A, MSGBOX_SIGN end CinnabarIsland_PokemonLab_Entrance_EventScript_16E2A6:: @ 816E2A6 - msgbox gUnknown_8199F83, 3 + msgbox gUnknown_8199F83, MSGBOX_SIGN end CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF:: @ 816E2AF - msgbox gUnknown_8199F9A, 3 + msgbox gUnknown_8199F9A, MSGBOX_SIGN end diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index c0dc92ca0..41e0bc938 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -8,7 +8,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 call EventScript_1A8CAD goto_if_set FLAG_DID_SEELOR_TRADE, EventScript_16E473 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E45B call EventScript_1A8CBD compare VAR_0x8004, 6 @@ -147,7 +147,7 @@ EventScript_16E668:: @ 816E668 getspeciesname 0, SPECIES_OMANYTE getitemname 1, ITEM_HELIX_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 @@ -162,7 +162,7 @@ EventScript_16E6A6:: @ 816E6A6 getspeciesname 0, SPECIES_KABUTO getitemname 1, ITEM_DOME_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 @@ -177,7 +177,7 @@ EventScript_16E6E4:: @ 816E6E4 getspeciesname 0, SPECIES_AERODACTYL getitemname 1, ITEM_OLD_AMBER msgbox gUnknown_819A3D4, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 @@ -257,7 +257,7 @@ EventScript_16E827:: @ 816E827 waitfanfare setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E895 call EventScript_1A8C27 call EventScript_1A74EB @@ -272,7 +272,7 @@ EventScript_16E85B:: @ 816E85B waitfanfare setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E88A call EventScript_1A8C33 goto EventScript_16E88A diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 96af461d3..2a9dc1edf 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -2,7 +2,7 @@ CinnabarIsland_PokemonLab_Lounge_MapScripts:: @ 816E2B8 .byte 0 CinnabarIsland_PokemonLab_Lounge_EventScript_16E2B9:: @ 816E2B9 - msgbox gUnknown_8199FB3, 2 + msgbox gUnknown_8199FB3, MSGBOX_NPC end CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 @@ -12,7 +12,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 call EventScript_1A8CAD goto_if_set FLAG_DID_ESPHERE_TRADE, EventScript_16E334 msgbox gUnknown_81A59FE, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E31C call EventScript_1A8CBD compare VAR_0x8004, 6 @@ -51,7 +51,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E copyvar VAR_0x8009, VAR_RESULT goto_if_set FLAG_DID_TANGENY_TRADE, EventScript_16E3D4 msgbox gUnknown_81A5AD6, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16E3BC special Special_ChooseMonFromParty waitstate diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc index e390fd266..dd38a85b5 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc @@ -6,13 +6,13 @@ CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3DF:: @ 816E3DF end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3E5:: @ 816E3E5 - msgbox gUnknown_819A015, 2 + msgbox gUnknown_819A015, MSGBOX_NPC end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE:: @ 816E3EE - msgbox gUnknown_819A04A, 3 + msgbox gUnknown_819A04A, MSGBOX_SIGN end CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3F7:: @ 816E3F7 - msgbox gUnknown_819A128, 3 + msgbox gUnknown_819A128, MSGBOX_SIGN end diff --git a/data/maps/DiglettsCave_NorthEntrance/scripts.inc b/data/maps/DiglettsCave_NorthEntrance/scripts.inc index 890c5183c..a11fa4c3a 100644 --- a/data/maps/DiglettsCave_NorthEntrance/scripts.inc +++ b/data/maps/DiglettsCave_NorthEntrance/scripts.inc @@ -2,5 +2,5 @@ DiglettsCave_NorthEntrance_MapScripts:: @ 8160EE7 .byte 0 DiglettsCave_NorthEntrance_EventScript_160EE8:: @ 8160EE8 - msgbox gUnknown_817462C, 2 + msgbox gUnknown_817462C, MSGBOX_NPC end diff --git a/data/maps/DiglettsCave_SouthEntrance/scripts.inc b/data/maps/DiglettsCave_SouthEntrance/scripts.inc index 0aab02b7f..2ee397c02 100644 --- a/data/maps/DiglettsCave_SouthEntrance/scripts.inc +++ b/data/maps/DiglettsCave_SouthEntrance/scripts.inc @@ -2,5 +2,5 @@ DiglettsCave_SouthEntrance_MapScripts:: @ 8160EFB .byte 0 DiglettsCave_SouthEntrance_EventScript_160EFC:: @ 8160EFC - msgbox gUnknown_81746A7, 2 + msgbox gUnknown_81746A7, MSGBOX_NPC end diff --git a/data/maps/FiveIsland/scripts.inc b/data/maps/FiveIsland/scripts.inc index a26723b11..6b925d8f9 100644 --- a/data/maps/FiveIsland/scripts.inc +++ b/data/maps/FiveIsland/scripts.inc @@ -7,13 +7,13 @@ FiveIsland_OnTransition:: @ 8167E94 end FiveIsland_EventScript_167E98:: @ 8167E98 - msgbox gUnknown_8182DFB, 3 + msgbox gUnknown_8182DFB, MSGBOX_SIGN end FiveIsland_EventScript_167EA1:: @ 8167EA1 - msgbox gUnknown_8182E26, 2 + msgbox gUnknown_8182E26, MSGBOX_NPC end FiveIsland_EventScript_167EAA:: @ 8167EAA - msgbox gUnknown_8182E96, 2 + msgbox gUnknown_8182E96, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_House1/scripts.inc b/data/maps/FiveIsland_House1/scripts.inc index 4f34587d7..86f6cbcb4 100644 --- a/data/maps/FiveIsland_House1/scripts.inc +++ b/data/maps/FiveIsland_House1/scripts.inc @@ -2,5 +2,5 @@ FiveIsland_House1_MapScripts:: @ 8171D56 .byte 0 FiveIsland_House1_EventScript_171D57:: @ 8171D57 - msgbox gUnknown_81A3CAC, 2 + msgbox gUnknown_81A3CAC, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_House2/scripts.inc b/data/maps/FiveIsland_House2/scripts.inc index e46909905..79cfa755f 100644 --- a/data/maps/FiveIsland_House2/scripts.inc +++ b/data/maps/FiveIsland_House2/scripts.inc @@ -2,5 +2,5 @@ FiveIsland_House2_MapScripts:: @ 8171D60 .byte 0 FiveIsland_House2_EventScript_171D61:: @ 8171D61 - msgbox gUnknown_81A3D5E, 2 + msgbox gUnknown_81A3D5E, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc index 1f608669b..b6f4e0257 100644 --- a/data/maps/FiveIsland_LostCave_Room1/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc @@ -3,5 +3,5 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6 FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7 trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, Text_17CEF5, Text_17CF42 - msgbox gUnknown_817CF54, 6 + msgbox gUnknown_817CF54, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc index 6beca99ec..38241ab71 100644 --- a/data/maps/FiveIsland_LostCave_Room4/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc @@ -3,5 +3,5 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10 FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11 trainerbattle_single TRAINER_PSYCHIC_LAURA, Text_17CFC1, Text_17CFFB - msgbox gUnknown_817D037, 6 + msgbox gUnknown_817D037, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index bf9844b12..21fd9be76 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -37,15 +37,15 @@ EventScript_168983:: @ 8168983 FiveIsland_Meadow_EventScript_16898D:: @ 816898D trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_49, Text_18AC88, Text_18ACB3 - msgbox gUnknown_818ACC5, 6 + msgbox gUnknown_818ACC5, MSGBOX_AUTOCLOSE end FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_50, Text_18ACF0, Text_18AD39 - msgbox gUnknown_818AD59, 6 + msgbox gUnknown_818AD59, MSGBOX_AUTOCLOSE end FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_51, Text_18ADC6, Text_18ADFB - msgbox gUnknown_818AE16, 6 + msgbox gUnknown_818AE16, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 9e3c0d8e1..00dab6998 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -48,7 +48,7 @@ FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 EventScript_168A86:: @ 8168A86 msgbox gUnknown_818B105, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_168A9B releaseall end diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index 8336c5fcb..01da41d52 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -15,9 +15,9 @@ FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00 end FiveIsland_PokemonCenter_1F_EventScript_171D09:: @ 8171D09 - msgbox gUnknown_81A3BBA, 2 + msgbox gUnknown_81A3BBA, MSGBOX_NPC end FiveIsland_PokemonCenter_1F_EventScript_171D12:: @ 8171D12 - msgbox gUnknown_81A3BFD, 2 + msgbox gUnknown_81A3BFD, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index 4a8b01c27..4a5502062 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -40,5 +40,5 @@ Movement_168841:: @ 8168841 step_end FiveIsland_ResortGorgeous_EventScript_168844:: @ 8168844 - msgbox gUnknown_818A7FE, 3 + msgbox gUnknown_818A7FE, MSGBOX_SIGN end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index e8c30c862..946508db5 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -144,5 +144,5 @@ Movement_172060:: @ 8172060 step_end FiveIsland_ResortGorgeous_House_EventScript_172062:: @ 8172062 - msgbox gUnknown_81A4657, 2 + msgbox gUnknown_81A4657, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index d3d5f7fba..1ad6a2991 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -30,7 +30,7 @@ EventScript_163F6E:: @ 8163F6E end FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78 - msgbox gUnknown_817BB15, 3 + msgbox gUnknown_817BB15, MSGBOX_SIGN end FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 @@ -44,12 +44,12 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 trainerbattle_single TRAINER_SCIENTIST_GIDEON, Text_17BBAF, Text_17BC55, EventScript_163FCD goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_163FB7 - msgbox gUnknown_817BCA3, 6 + msgbox gUnknown_817BCA3, MSGBOX_AUTOCLOSE end EventScript_163FB7:: @ 8163FB7 famechecker FAMECHECKER_GIOVANNI, 5 - msgbox gUnknown_817BCD7, 6 + msgbox gUnknown_817BCD7, MSGBOX_AUTOCLOSE end EventScript_163FCD:: @ 8163FCD @@ -61,17 +61,17 @@ EventScript_163FCD:: @ 8163FCD FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, Text_17B54D, Text_17B585 - msgbox gUnknown_817B5A6, 6 + msgbox gUnknown_817B5A6, MSGBOX_AUTOCLOSE end FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, Text_17B677, Text_17B6D9 - msgbox gUnknown_817B6EF, 6 + msgbox gUnknown_817B6EF, MSGBOX_AUTOCLOSE end FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, Text_17B8DA, Text_17B9FB, EventScript_16402F - msgbox gUnknown_817BA64, 6 + msgbox gUnknown_817BA64, MSGBOX_AUTOCLOSE end EventScript_16402F:: @ 816402F @@ -99,12 +99,12 @@ EventScript_164065:: @ 8164065 FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, Text_17B5D6, Text_17B62F - msgbox gUnknown_817B642, 6 + msgbox gUnknown_817B642, MSGBOX_AUTOCLOSE end FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, Text_17B72D, Text_17B79C, EventScript_1640A2 - msgbox gUnknown_817B7FA, 6 + msgbox gUnknown_817B7FA, MSGBOX_AUTOCLOSE end EventScript_1640A2:: @ 81640A2 diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 890891c10..8f84b1e6c 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -90,10 +90,10 @@ FourIsland_EventScript_167D55:: @ 8167D55 EventScript_167D9B:: @ 8167D9B msgbox gUnknown_81BF5E3, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_167DD1 msgbox gUnknown_81BF7B6, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_167DD1 msgbox gUnknown_81BF6CF clearflag FLAG_PENDING_DAYCARE_EGG @@ -161,13 +161,13 @@ FourIsland_EventScript_167E5A:: @ 8167E5A end FourIsland_EventScript_167E73:: @ 8167E73 - msgbox gUnknown_8182D8E, 2 + msgbox gUnknown_8182D8E, MSGBOX_NPC end FourIsland_EventScript_167E7C:: @ 8167E7C - msgbox gUnknown_8182A03, 3 + msgbox gUnknown_8182A03, MSGBOX_SIGN end FourIsland_EventScript_167E85:: @ 8167E85 - msgbox gUnknown_8182DEB, 3 + msgbox gUnknown_8182DEB, MSGBOX_SIGN end diff --git a/data/maps/FourIsland_House1/scripts.inc b/data/maps/FourIsland_House1/scripts.inc index d7139c370..46ec500fe 100644 --- a/data/maps/FourIsland_House1/scripts.inc +++ b/data/maps/FourIsland_House1/scripts.inc @@ -2,5 +2,5 @@ FourIsland_House1_MapScripts:: @ 8171C44 .byte 0 FourIsland_House1_EventScript_171C45:: @ 8171C45 - msgbox gUnknown_81A3802, 2 + msgbox gUnknown_81A3802, MSGBOX_NPC end diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 54c60cb56..39eb3f0b4 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -188,5 +188,5 @@ Movement_163F23:: @ 8163F23 step_end FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25 - msgbox gUnknown_817B457, 2 + msgbox gUnknown_817B457, MSGBOX_NPC end diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index 5074a4f39..9918fb307 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -29,5 +29,5 @@ Items_171CD4:: @ 8171CD4 end FourIsland_Mart_EventScript_171CE8:: @ 8171CE8 - msgbox gUnknown_81A3B14, 2 + msgbox gUnknown_81A3B14, MSGBOX_NPC end diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index 656354413..3d99baddb 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9 end FourIsland_PokemonCenter_1F_EventScript_171C02:: @ 8171C02 - msgbox gUnknown_81A3627, 2 + msgbox gUnknown_81A3627, MSGBOX_NPC end FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B - msgbox gUnknown_81A3697, 2 + msgbox gUnknown_81A3697, MSGBOX_NPC end FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14 - msgbox gUnknown_81A3734, 2 + msgbox gUnknown_81A3734, MSGBOX_NPC end diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 3d5409e19..d7034d740 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -15,7 +15,7 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 compare VAR_RESULT, 3 goto_if_eq EventScript_171B86 msgbox gUnknown_81BF7E4, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_171993 msgbox gUnknown_81BF916 release @@ -54,7 +54,7 @@ EventScript_1719F7:: @ 81719F7 EventScript_171A01:: @ 8171A01 msgbox gUnknown_81BF89F, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_171993 goto EventScript_1719F7 end @@ -89,10 +89,10 @@ EventScript_171A52:: @ 8171A52 setvar VAR_0x8004, 0 call EventScript_171A41 msgbox gUnknown_81BF89F, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_171993 msgbox gUnknown_81BFAE8, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_171A90 goto EventScript_1719F7 end @@ -116,7 +116,7 @@ EventScript_171A90:: @ 8171A90 EventScript_171ACF:: @ 8171ACF special GetDaycareCost msgbox gUnknown_81BFA3B, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_171AEB goto EventScript_1719F7 end @@ -150,7 +150,7 @@ EventScript_171B05:: @ 8171B05 EventScript_171B4E:: @ 8171B4E msgbox gUnknown_81BF94F, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_171A90 goto EventScript_1719F7 end @@ -192,7 +192,7 @@ EventScript_171B86:: @ 8171B86 setvar VAR_0x8004, 1 call EventScript_171A41 msgbox gUnknown_81BFAE8, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_171A90 msgbox gUnknown_81BF976 release diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 15c3330d7..cde08dd9b 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -17,19 +17,19 @@ EventScript_166D97:: @ 8166D97 return FuchsiaCity_EventScript_166D9D:: @ 8166D9D - msgbox gUnknown_818056E, 2 + msgbox gUnknown_818056E, MSGBOX_NPC end FuchsiaCity_EventScript_166DA6:: @ 8166DA6 - msgbox gUnknown_81805C6, 2 + msgbox gUnknown_81805C6, MSGBOX_NPC end FuchsiaCity_EventScript_166DAF:: @ 8166DAF - msgbox gUnknown_818062C, 2 + msgbox gUnknown_818062C, MSGBOX_NPC end FuchsiaCity_EventScript_166DB8:: @ 8166DB8 - msgbox gUnknown_818065A, 2 + msgbox gUnknown_818065A, MSGBOX_NPC end FuchsiaCity_EventScript_166DC1:: @ 8166DC1 @@ -41,23 +41,23 @@ FuchsiaCity_EventScript_166DC1:: @ 8166DC1 end FuchsiaCity_EventScript_166DDA:: @ 8166DDA - msgbox gUnknown_81806AB, 3 + msgbox gUnknown_81806AB, MSGBOX_SIGN end FuchsiaCity_EventScript_166DE3:: @ 8166DE3 - msgbox gUnknown_81806D3, 3 + msgbox gUnknown_81806D3, MSGBOX_SIGN end FuchsiaCity_EventScript_166DEC:: @ 8166DEC - msgbox gUnknown_81806F0, 3 + msgbox gUnknown_81806F0, MSGBOX_SIGN end FuchsiaCity_EventScript_166DF5:: @ 8166DF5 - msgbox gUnknown_818070D, 3 + msgbox gUnknown_818070D, MSGBOX_SIGN end EventScript_166DFE:: @ 8166DFE - msgbox gUnknown_8180727, 3 + msgbox gUnknown_8180727, MSGBOX_SIGN end FuchsiaCity_EventScript_166E07:: @ 8166E07 diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index f0d1e1a01..72dbb8e8e 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -7,9 +7,9 @@ FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C goto_if_set FLAG_GOT_HM04, EventScript_16D7FA goto_if_set FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH, EventScript_16D780 msgbox gUnknown_8198DF9, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES call_if_eq EventScript_16D7E8 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO call_if_eq EventScript_16D7F1 release end @@ -55,9 +55,9 @@ EventScript_16D7FA:: @ 816D7FA end FuchsiaCity_Building1_EventScript_16D804:: @ 816D804 - msgbox gUnknown_819913C, 3 + msgbox gUnknown_819913C, MSGBOX_SIGN end FuchsiaCity_Building1_EventScript_16D80D:: @ 816D80D - msgbox gUnknown_8199167, 3 + msgbox gUnknown_8199167, MSGBOX_SIGN end diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 38e4190ce..2e299a867 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -36,33 +36,33 @@ EventScript_16D5E7:: @ 816D5E7 FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1 trainerbattle_single TRAINER_TAMER_PHIL, Text_198866, Text_1988B6 - msgbox gUnknown_81988CB, 6 + msgbox gUnknown_81988CB, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D608:: @ 816D608 trainerbattle_single TRAINER_TAMER_EDGAR, Text_19891F, Text_19897F - msgbox gUnknown_8198985, 6 + msgbox gUnknown_8198985, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F trainerbattle_single TRAINER_JUGGLER_KIRK, Text_19871E, Text_198779 famechecker FAMECHECKER_KOGA, 2 - msgbox gUnknown_8198787, 6 + msgbox gUnknown_8198787, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D643:: @ 816D643 trainerbattle_single TRAINER_JUGGLER_SHAWN, Text_1989A1, Text_1989EA - msgbox gUnknown_8198A10, 6 + msgbox gUnknown_8198A10, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A trainerbattle_single TRAINER_JUGGLER_KAYDEN, Text_198629, Text_1986B4 - msgbox gUnknown_81986C9, 6 + msgbox gUnknown_81986C9, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D671:: @ 816D671 trainerbattle_single TRAINER_JUGGLER_NATE, Text_1987E8, Text_198812 - msgbox gUnknown_8198825, 6 + msgbox gUnknown_8198825, MSGBOX_AUTOCLOSE end FuchsiaCity_Gym_EventScript_16D688:: @ 816D688 diff --git a/data/maps/FuchsiaCity_House1/scripts.inc b/data/maps/FuchsiaCity_House1/scripts.inc index 32be06c57..dc32f78c4 100644 --- a/data/maps/FuchsiaCity_House1/scripts.inc +++ b/data/maps/FuchsiaCity_House1/scripts.inc @@ -2,7 +2,7 @@ FuchsiaCity_House1_MapScripts:: @ 816D6C5 .byte 0 FuchsiaCity_House1_EventScript_16D6C6:: @ 816D6C6 - msgbox gUnknown_8198BBB, 2 + msgbox gUnknown_8198BBB, MSGBOX_NPC end FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF @@ -14,5 +14,5 @@ FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF end FuchsiaCity_House1_EventScript_16D6E8:: @ 816D6E8 - msgbox gUnknown_8198C7B, 2 + msgbox gUnknown_8198C7B, MSGBOX_NPC end diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index d0f842a0e..78fb5ffb8 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -6,7 +6,7 @@ FuchsiaCity_House2_EventScript_16D817:: @ 816D817 faceplayer goto_if_set FLAG_GOT_GOOD_ROD, EventScript_16D83F msgbox gUnknown_819918E, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16D849 msgbox gUnknown_8199337 release diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index 99af39686..ab6f4e658 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -5,7 +5,7 @@ FuchsiaCity_House3_EventScript_16D895:: @ 816D895 lock faceplayer msgbox gUnknown_81993B9, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16D8B0 goto EventScript_16D941 end @@ -30,7 +30,7 @@ EventScript_16D8B0:: @ 816D8B0 goto_if_eq EventScript_16D8B0 special ScrSpecial_GetPokemonNicknameAndMoveName msgbox gUnknown_8199485, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16D919 goto EventScript_16D941 end diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index 85390e4a0..67fceb572 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -2,11 +2,11 @@ FuchsiaCity_Mart_MapScripts:: @ 816D4E0 .byte 0 FuchsiaCity_Mart_EventScript_16D4E1:: @ 816D4E1 - msgbox gUnknown_8198134, 2 + msgbox gUnknown_8198134, MSGBOX_NPC end FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA - msgbox gUnknown_81980BC, 2 + msgbox gUnknown_81980BC, MSGBOX_NPC end FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc index a5ebbfb56..864a2cb86 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700 end FuchsiaCity_PokemonCenter_1F_EventScript_16D709:: @ 816D709 - msgbox gUnknown_8198CB7, 2 + msgbox gUnknown_8198CB7, MSGBOX_NPC end FuchsiaCity_PokemonCenter_1F_EventScript_16D712:: @ 816D712 - msgbox gUnknown_8198D2E, 2 + msgbox gUnknown_8198D2E, MSGBOX_NPC end FuchsiaCity_PokemonCenter_1F_EventScript_16D71B:: @ 816D71B - msgbox gUnknown_8198D9B, 2 + msgbox gUnknown_8198D9B, MSGBOX_NPC end diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index f04639875..b2085a32f 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -38,7 +38,7 @@ EventScript_16D312:: @ 816D312 lockall textcolor 0 msgbox gUnknown_8197E1A, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16D345 msgbox gUnknown_8197E48 closemessage @@ -102,7 +102,7 @@ EventScript_16D391:: @ 816D391 waitmovement 0 showmoneybox 0, 0, 0 msgbox gUnknown_8197C87, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16D3CA msgbox gUnknown_8197DE9 goto EventScript_16D49A @@ -200,7 +200,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 lock faceplayer msgbox gUnknown_8197EB0, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16D4D6 msgbox gUnknown_819809E release diff --git a/data/maps/FuchsiaCity_ZooBuilding/scripts.inc b/data/maps/FuchsiaCity_ZooBuilding/scripts.inc index bbff0b929..210acd87f 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/scripts.inc +++ b/data/maps/FuchsiaCity_ZooBuilding/scripts.inc @@ -2,17 +2,17 @@ FuchsiaCity_ZooBuilding_MapScripts:: @ 816D528 .byte 0 FuchsiaCity_ZooBuilding_EventScript_16D529:: @ 816D529 - msgbox gUnknown_819816B, 2 + msgbox gUnknown_819816B, MSGBOX_NPC end FuchsiaCity_ZooBuilding_EventScript_16D532:: @ 816D532 - msgbox gUnknown_81981C2, 2 + msgbox gUnknown_81981C2, MSGBOX_NPC end FuchsiaCity_ZooBuilding_EventScript_16D53B:: @ 816D53B - msgbox gUnknown_819822A, 2 + msgbox gUnknown_819822A, MSGBOX_NPC end FuchsiaCity_ZooBuilding_EventScript_16D544:: @ 816D544 - msgbox gUnknown_8198285, 2 + msgbox gUnknown_8198285, MSGBOX_NPC end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 09647da0b..5eb676e9d 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -37,7 +37,7 @@ EventScript_16EAB9:: @ 816EAB9 end IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 - msgbox gUnknown_819A837, 2 + msgbox gUnknown_819A837, MSGBOX_NPC end IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index 97c308549..3996e80dd 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -12,7 +12,7 @@ LavenderTown_EventScript_16687D:: @ 816687D lock faceplayer msgbox gUnknown_817F52E, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16689C msgbox gUnknown_817F568 release @@ -24,25 +24,25 @@ EventScript_16689C:: @ 816689C end LavenderTown_EventScript_1668A6:: @ 81668A6 - msgbox gUnknown_817F5B6, 2 + msgbox gUnknown_817F5B6, MSGBOX_NPC end LavenderTown_EventScript_1668AF:: @ 81668AF - msgbox gUnknown_817F614, 2 + msgbox gUnknown_817F614, MSGBOX_NPC end LavenderTown_EventScript_1668B8:: @ 81668B8 - msgbox gUnknown_817F676, 3 + msgbox gUnknown_817F676, MSGBOX_SIGN end LavenderTown_EventScript_1668C1:: @ 81668C1 - msgbox gUnknown_817F69A, 3 + msgbox gUnknown_817F69A, MSGBOX_SIGN end LavenderTown_EventScript_1668CA:: @ 81668CA - msgbox gUnknown_817F6D6, 3 + msgbox gUnknown_817F6D6, MSGBOX_SIGN end LavenderTown_EventScript_1668D3:: @ 81668D3 - msgbox gUnknown_817F6F7, 3 + msgbox gUnknown_817F6F7, MSGBOX_SIGN end diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 21cbd52db..b6d5ae142 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -5,9 +5,9 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266 lock faceplayer msgbox gUnknown_8193A4B, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16B287 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16B2AA end @@ -15,9 +15,9 @@ EventScript_16B287:: @ 816B287 msgbox gUnknown_8193AA6 special Special_ChooseMonFromParty waitstate - compare VAR_0x8004, 6 + compare VAR_0x8004, PARTY_SIZE goto_if_lt EventScript_16B2B4 - compare VAR_0x8004, 6 + compare VAR_0x8004, PARTY_SIZE goto_if_ge EventScript_16B2AA end @@ -39,9 +39,9 @@ EventScript_16B2B4:: @ 816B2B4 compare VAR_RESULT, 1 goto_if_eq EventScript_16B311 msgbox gUnknown_8193AD2, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16B31B - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16B2AA end diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index a09858f03..a0352ca88 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -2,15 +2,15 @@ LavenderTown_Mart_MapScripts:: @ 816B34F .byte 0 LavenderTown_Mart_EventScript_16B350:: @ 816B350 - msgbox gUnknown_8193CE5, 2 + msgbox gUnknown_8193CE5, MSGBOX_NPC end LavenderTown_Mart_EventScript_16B359:: @ 816B359 - msgbox gUnknown_8193DB6, 2 + msgbox gUnknown_8193DB6, MSGBOX_NPC end LavenderTown_Mart_EventScript_16B362:: @ 816B362 - msgbox gUnknown_8193DF1, 2 + msgbox gUnknown_8193DF1, MSGBOX_NPC end LavenderTown_Mart_EventScript_16B36B:: @ 816B36B diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index df6eb0e89..7718ecbfd 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE end LavenderTown_PokemonCenter_1F_EventScript_16B107:: @ 816B107 - msgbox gUnknown_8193465, 2 + msgbox gUnknown_8193465, MSGBOX_NPC end LavenderTown_PokemonCenter_1F_EventScript_16B110:: @ 816B110 - msgbox gUnknown_81934DE, 2 + msgbox gUnknown_81934DE, MSGBOX_NPC end LavenderTown_PokemonCenter_1F_EventScript_16B119:: @ 816B119 - msgbox gUnknown_819353A, 2 + msgbox gUnknown_819353A, MSGBOX_NPC end diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index a8c35b814..612993321 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -34,7 +34,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA:: @ 816B1AA end LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3 - msgbox gUnknown_81936B4, 2 + msgbox gUnknown_81936B4, MSGBOX_NPC end LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC @@ -78,5 +78,5 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B211:: @ 816B211 end LavenderTown_VolunteerPokemonHouse_EventScript_16B229:: @ 816B229 - msgbox gUnknown_819392B, 3 + msgbox gUnknown_819392B, MSGBOX_SIGN end diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 00209f3c9..75e6813e8 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -117,15 +117,15 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4 trainerbattle_single TRAINER_PKMN_RANGER_LOGAN, Text_17AB73, Text_17ABAA - msgbox gUnknown_817ABD8, 6 + msgbox gUnknown_817ABD8, MSGBOX_AUTOCLOSE end MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB trainerbattle_single TRAINER_PKMN_RANGER_BETH, Text_17AC55, Text_17AC82 - msgbox gUnknown_817ACA2, 6 + msgbox gUnknown_817ACA2, MSGBOX_AUTOCLOSE end MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2 trainerbattle_single TRAINER_CRUSH_GIRL_JOCELYN, Text_17AD06, Text_17AD6B - msgbox gUnknown_817AD89, 6 + msgbox gUnknown_817AD89, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index b4506a56c..4c80943d1 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -7,40 +7,40 @@ MtMoon_1F_OnTransition:: @ 81605EA end MtMoon_1F_EventScript_1605EE:: @ 81605EE - msgbox gUnknown_8172AE0, 3 + msgbox gUnknown_8172AE0, MSGBOX_SIGN end MtMoon_1F_EventScript_1605F7:: @ 81605F7 trainerbattle_single TRAINER_HIKER_MARCOS, Text_17279D, Text_1727CB - msgbox gUnknown_81727DF, 6 + msgbox gUnknown_81727DF, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_16060E:: @ 816060E trainerbattle_single TRAINER_YOUNGSTER_JOSH, Text_17281D, Text_172844 - msgbox gUnknown_8172863, 6 + msgbox gUnknown_8172863, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_160625:: @ 8160625 trainerbattle_single TRAINER_LASS_MIRIAM, Text_172896, Text_1728C3 - msgbox gUnknown_81728D2, 6 + msgbox gUnknown_81728D2, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_16063C:: @ 816063C trainerbattle_single TRAINER_LASS_IRIS, Text_172972, Text_1729A4 - msgbox gUnknown_81729AC, 6 + msgbox gUnknown_81729AC, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_160653:: @ 8160653 trainerbattle_single TRAINER_SUPER_NERD_JOVAN, Text_17290B, Text_172927 - msgbox gUnknown_817293C, 6 + msgbox gUnknown_817293C, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_16066A:: @ 816066A trainerbattle_single TRAINER_BUG_CATCHER_KENT, Text_1729EA, Text_172A1A - msgbox gUnknown_8172A26, 6 + msgbox gUnknown_8172A26, MSGBOX_AUTOCLOSE end MtMoon_1F_EventScript_160681:: @ 8160681 trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, Text_172A55, Text_172A8F - msgbox gUnknown_8172A97, 6 + msgbox gUnknown_8172A97, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index cb37f0cbf..0ebee79d6 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -55,7 +55,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B lock faceplayer msgbox gUnknown_8172E77, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1607DE removeobject 1 giveitem_msg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 @@ -87,7 +87,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F lock faceplayer msgbox gUnknown_8172E94, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1607DE removeobject 2 giveitem_msg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 @@ -120,20 +120,20 @@ Movement_1607E0:: @ 81607E0 MtMoon_B2F_EventScript_1607E4:: @ 81607E4 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, Text_172C5A, Text_172CB8 - msgbox gUnknown_8172CCB, 6 + msgbox gUnknown_8172CCB, MSGBOX_AUTOCLOSE end MtMoon_B2F_EventScript_1607FB:: @ 81607FB trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, Text_172CFC, Text_172D46 - msgbox gUnknown_8172D51, 6 + msgbox gUnknown_8172D51, MSGBOX_AUTOCLOSE end MtMoon_B2F_EventScript_160812:: @ 8160812 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, Text_172D82, Text_172DAF - msgbox gUnknown_8172DC1, 6 + msgbox gUnknown_8172DC1, MSGBOX_AUTOCLOSE end MtMoon_B2F_EventScript_160829:: @ 8160829 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, Text_172DF0, Text_172E3E - msgbox gUnknown_8172E4B, 6 + msgbox gUnknown_8172E4B, MSGBOX_AUTOCLOSE end diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index eae7004c8..545a3d333 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -100,13 +100,13 @@ EventScript_16753F:: @ 816753F end OneIsland_EventScript_167549:: @ 8167549 - msgbox gUnknown_8181A4A, 2 + msgbox gUnknown_8181A4A, MSGBOX_NPC end OneIsland_EventScript_167552:: @ 8167552 - msgbox gUnknown_81819E1, 3 + msgbox gUnknown_81819E1, MSGBOX_SIGN end OneIsland_EventScript_16755B:: @ 816755B - msgbox gUnknown_8181A0A, 3 + msgbox gUnknown_8181A0A, MSGBOX_SIGN end diff --git a/data/maps/OneIsland_House1/scripts.inc b/data/maps/OneIsland_House1/scripts.inc index 957dcada9..172f5f4a9 100644 --- a/data/maps/OneIsland_House1/scripts.inc +++ b/data/maps/OneIsland_House1/scripts.inc @@ -2,9 +2,9 @@ OneIsland_House1_MapScripts:: @ 817135B .byte 0 OneIsland_House1_EventScript_17135C:: @ 817135C - msgbox gUnknown_81A2332, 2 + msgbox gUnknown_81A2332, MSGBOX_NPC end OneIsland_House1_EventScript_171365:: @ 8171365 - msgbox gUnknown_81A2380, 2 + msgbox gUnknown_81A2380, MSGBOX_NPC end diff --git a/data/maps/OneIsland_House2/scripts.inc b/data/maps/OneIsland_House2/scripts.inc index 9966217cd..0b1761475 100644 --- a/data/maps/OneIsland_House2/scripts.inc +++ b/data/maps/OneIsland_House2/scripts.inc @@ -2,5 +2,5 @@ OneIsland_House2_MapScripts:: @ 817136E .byte 0 OneIsland_House2_EventScript_17136F:: @ 817136F - msgbox gUnknown_81A23B8, 2 + msgbox gUnknown_81A23B8, MSGBOX_NPC end diff --git a/data/maps/OneIsland_KindleRoad/scripts.inc b/data/maps/OneIsland_KindleRoad/scripts.inc index 78c2efb13..00c5106a7 100644 --- a/data/maps/OneIsland_KindleRoad/scripts.inc +++ b/data/maps/OneIsland_KindleRoad/scripts.inc @@ -2,9 +2,9 @@ OneIsland_KindleRoad_MapScripts:: @ 8168758 .byte 0 OneIsland_KindleRoad_EventScript_168759:: @ 8168759 - msgbox gUnknown_8189D02, 3 + msgbox gUnknown_8189D02, MSGBOX_SIGN end OneIsland_KindleRoad_EventScript_168762:: @ 8168762 - msgbox gUnknown_8189D32, 3 + msgbox gUnknown_8189D32, MSGBOX_SIGN end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index c0f9e08ed..74027ec35 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -2,19 +2,19 @@ OneIsland_KindleRoad_EmberSpa_MapScripts:: @ 816535B .byte 0 OneIsland_KindleRoad_EmberSpa_EventScript_16535C:: @ 816535C - msgbox gUnknown_817D34A, 2 + msgbox gUnknown_817D34A, MSGBOX_NPC end OneIsland_KindleRoad_EmberSpa_EventScript_165365:: @ 8165365 - msgbox gUnknown_817D3DE, 2 + msgbox gUnknown_817D3DE, MSGBOX_NPC end OneIsland_KindleRoad_EmberSpa_EventScript_16536E:: @ 816536E - msgbox gUnknown_817D4AA, 2 + msgbox gUnknown_817D4AA, MSGBOX_NPC end OneIsland_KindleRoad_EmberSpa_EventScript_165377:: @ 8165377 - msgbox gUnknown_817D4E3, 2 + msgbox gUnknown_817D4E3, MSGBOX_NPC end OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index fac29facf..b3cc2117f 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -316,14 +316,14 @@ EventScript_171044:: @ 8171044 applymovement 3, Movement_FacePlayer waitmovement 0 msgbox gUnknown_81A19AA, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_171099 goto EventScript_1710B2 end EventScript_171099:: @ 8171099 msgbox gUnknown_81A1A08, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_171099 goto EventScript_1710B2 end @@ -386,11 +386,11 @@ Movement_171142:: @ 8171142 step_end OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148 - msgbox gUnknown_81A20D5, 2 + msgbox gUnknown_81A20D5, MSGBOX_NPC end OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151 - msgbox gUnknown_81A212D, 2 + msgbox gUnknown_81A212D, MSGBOX_NPC end OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A diff --git a/data/maps/OneIsland_TreasureBeach/scripts.inc b/data/maps/OneIsland_TreasureBeach/scripts.inc index 192cf4898..a49a763a1 100644 --- a/data/maps/OneIsland_TreasureBeach/scripts.inc +++ b/data/maps/OneIsland_TreasureBeach/scripts.inc @@ -2,5 +2,5 @@ OneIsland_TreasureBeach_MapScripts:: @ 816876B .byte 0 OneIsland_TreasureBeach_EventScript_16876C:: @ 816876C - msgbox gUnknown_8189DCE, 2 + msgbox gUnknown_8189DCE, MSGBOX_NPC end diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 1925cabd4..4d3356019 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -438,7 +438,7 @@ Movement_16582C:: @ 816582C step_end PalletTown_EventScript_16582F:: @ 816582F - msgbox gUnknown_817D80D, 2 + msgbox gUnknown_817D80D, MSGBOX_NPC end PalletTown_EventScript_165838:: @ 8165838 @@ -449,15 +449,15 @@ PalletTown_EventScript_165838:: @ 8165838 end PalletTown_EventScript_165850:: @ 8165850 - msgbox gUnknown_817D87F, 3 + msgbox gUnknown_817D87F, MSGBOX_SIGN end PalletTown_EventScript_165859:: @ 8165859 - msgbox gUnknown_817D88A, 3 + msgbox gUnknown_817D88A, MSGBOX_SIGN end PalletTown_EventScript_165862:: @ 8165862 - msgbox gUnknown_817D895, 3 + msgbox gUnknown_817D895, MSGBOX_SIGN end PalletTown_EventScript_16586B:: @ 816586B diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index d9c3729ae..b8d786c41 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -51,7 +51,7 @@ EventScript_168DB9:: @ 8168DB9 compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 goto_if_lt EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_168E3C msgbox gUnknown_818D8B2 special Special_ChooseMonFromParty @@ -167,13 +167,13 @@ EventScript_168F59:: @ 8168F59 end PalletTown_GarysHouse_EventScript_168F63:: @ 8168F63 - msgbox gUnknown_818D763, 2 + msgbox gUnknown_818D763, MSGBOX_NPC end PalletTown_GarysHouse_EventScript_168F6C:: @ 8168F6C - msgbox gUnknown_818D7A1, 3 + msgbox gUnknown_818D7A1, MSGBOX_SIGN end PalletTown_GarysHouse_EventScript_168F75:: @ 8168F75 - msgbox gUnknown_818DC47, 3 + msgbox gUnknown_818DC47, MSGBOX_SIGN end diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 983e1b1d3..0c623394d 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -22,11 +22,11 @@ EventScript_168CC8:: @ 8168CC8 end PalletTown_PlayersHouse_2F_EventScript_168CD2:: @ 8168CD2 - msgbox gUnknown_818D50B, 3 + msgbox gUnknown_818D50B, MSGBOX_SIGN end PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB - msgbox gUnknown_818D53B, 3 + msgbox gUnknown_818D53B, MSGBOX_SIGN end gUnknown_8168CE4:: @ 8168CE4 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 8e20d3cab..825b86e7f 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1167,25 +1167,25 @@ EventScript_169BE1:: @ 8169BE1 EventScript_OakDescribesBulbasaur:: @ 8169C14 msgbox gUnknown_818E272, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_ThisPokeIsRealyEnergetic - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_DeclinedStarter end EventScript_OakDescribesCharmander:: @ 8169C33 msgbox gUnknown_818E207, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_ThisPokeIsRealyEnergetic - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_DeclinedStarter end EventScript_OakDescribesSquirtle:: @ 8169C52 msgbox gUnknown_818E194, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_ThisPokeIsRealyEnergetic - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_DeclinedStarter end @@ -1209,9 +1209,9 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 playfanfare MUS_FAN5 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_GiveNicknameToStarter - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_SkipGiveNicknameToStarter end @@ -1368,15 +1368,15 @@ PalletTown_ProfessorOaksLab_EventScript_169E46:: @ 8169E46 end PalletTown_ProfessorOaksLab_EventScript_169E5F:: @ 8169E5F - msgbox gUnknown_818E9E5, 2 + msgbox gUnknown_818E9E5, MSGBOX_NPC end PalletTown_ProfessorOaksLab_EventScript_169E68:: @ 8169E68 - msgbox gUnknown_818EAF4, 3 + msgbox gUnknown_818EAF4, MSGBOX_SIGN end PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 - msgbox gUnknown_818EA66, 3 + msgbox gUnknown_818EA66, MSGBOX_SIGN end PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 4f9cef868..fd8b6ec9a 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -1025,14 +1025,14 @@ Movement_166042:: @ 8166042 step_end PewterCity_EventScript_166075:: @ 8166075 - msgbox gUnknown_817E436, 2 + msgbox gUnknown_817E436, MSGBOX_NPC end PewterCity_EventScript_16607E:: @ 816607E lock faceplayer msgbox gUnknown_817E53E, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_166136 msgbox gUnknown_817E589 closemessage @@ -1351,7 +1351,7 @@ PewterCity_EventScript_166244:: @ 8166244 lock faceplayer msgbox gUnknown_817E602, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_166263 msgbox gUnknown_817E644 release @@ -1363,15 +1363,15 @@ EventScript_166263:: @ 8166263 end PewterCity_EventScript_16626D:: @ 816626D - msgbox gUnknown_817E6F6, 3 + msgbox gUnknown_817E6F6, MSGBOX_SIGN end PewterCity_EventScript_166276:: @ 8166276 - msgbox gUnknown_817E748, 3 + msgbox gUnknown_817E748, MSGBOX_SIGN end PewterCity_EventScript_16627F:: @ 816627F - msgbox gUnknown_817E7C5, 3 + msgbox gUnknown_817E7C5, MSGBOX_SIGN end PewterCity_EventScript_166288:: @ 8166288 @@ -1382,7 +1382,7 @@ PewterCity_EventScript_166288:: @ 8166288 end PewterCity_EventScript_1662A0:: @ 81662A0 - msgbox gUnknown_817E824, 3 + msgbox gUnknown_817E824, MSGBOX_SIGN end PewterCity_EventScript_1662A9:: @ 81662A9 diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 540cf7965..92bafee06 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -38,7 +38,7 @@ EventScript_16A634:: @ 816A634 PewterCity_Gym_EventScript_16A63E:: @ 816A63E trainerbattle_single TRAINER_CAMPER_LIAM, Text_1911EC, Text_191237 - msgbox gUnknown_819126B, 6 + msgbox gUnknown_819126B, MSGBOX_AUTOCLOSE end PewterCity_Gym_EventScript_16A655:: @ 816A655 @@ -46,9 +46,9 @@ PewterCity_Gym_EventScript_16A655:: @ 816A655 faceplayer goto_if_set FLAG_DEFEATED_BROCK, EventScript_16A67F msgbox gUnknown_8191298, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16A689 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16A697 end diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc index cbd49c57a..58d201193 100644 --- a/data/maps/PewterCity_House1/scripts.inc +++ b/data/maps/PewterCity_House1/scripts.inc @@ -2,7 +2,7 @@ PewterCity_House1_MapScripts:: @ 816A71C .byte 0 PewterCity_House1_EventScript_16A71D:: @ 816A71D - msgbox gUnknown_81915DB, 2 + msgbox gUnknown_81915DB, MSGBOX_NPC end PewterCity_House1_EventScript_16A726:: @ 816A726 diff --git a/data/maps/PewterCity_House2/scripts.inc b/data/maps/PewterCity_House2/scripts.inc index 2db341b30..52a5bbc02 100644 --- a/data/maps/PewterCity_House2/scripts.inc +++ b/data/maps/PewterCity_House2/scripts.inc @@ -2,9 +2,9 @@ PewterCity_House2_MapScripts:: @ 816A7DC .byte 0 PewterCity_House2_EventScript_16A7DD:: @ 816A7DD - msgbox gUnknown_81917E4, 2 + msgbox gUnknown_81917E4, MSGBOX_NPC end PewterCity_House2_EventScript_16A7E6:: @ 816A7E6 - msgbox gUnknown_8191840, 2 + msgbox gUnknown_8191840, MSGBOX_NPC end diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index 72b021f20..d4f0b37c4 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -2,11 +2,11 @@ PewterCity_Mart_MapScripts:: @ 816A6CD .byte 0 PewterCity_Mart_EventScript_16A6CE:: @ 816A6CE - msgbox gUnknown_81914DE, 2 + msgbox gUnknown_81914DE, MSGBOX_NPC end PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7 - msgbox gUnknown_8191541, 2 + msgbox gUnknown_8191541, MSGBOX_NPC end PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index be0f797f3..f4a0345c5 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -16,9 +16,9 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B EventScript_16A348:: @ 816A348 msgbox gUnknown_8190550, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16A367 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16A37B end @@ -64,7 +64,7 @@ EventScript_16A3D1:: @ 816A3D1 textcolor 0 showmoneybox 0, 0, 0 msgbox gUnknown_81904B5, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16A402 msgbox gUnknown_81904F9 closemessage @@ -142,11 +142,11 @@ Movement_16A499:: @ 816A499 step_end PewterCity_Museum_1F_EventScript_16A49C:: @ 816A49C - msgbox gUnknown_81908CD, 2 + msgbox gUnknown_81908CD, MSGBOX_NPC end PewterCity_Museum_1F_EventScript_16A4A5:: @ 816A4A5 - msgbox gUnknown_81906B4, 2 + msgbox gUnknown_81906B4, MSGBOX_NPC end PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE @@ -174,7 +174,7 @@ EventScript_16A4FF:: @ 816A4FF end PewterCity_Museum_1F_EventScript_16A509:: @ 816A509 - msgbox gUnknown_819090A, 2 + msgbox gUnknown_819090A, MSGBOX_NPC end PewterCity_Museum_1F_EventScript_16A512:: @ 816A512 diff --git a/data/maps/PewterCity_Museum_2F/scripts.inc b/data/maps/PewterCity_Museum_2F/scripts.inc index 0e57e2c70..11b1af625 100644 --- a/data/maps/PewterCity_Museum_2F/scripts.inc +++ b/data/maps/PewterCity_Museum_2F/scripts.inc @@ -2,29 +2,29 @@ PewterCity_Museum_2F_MapScripts:: @ 816A552 .byte 0 PewterCity_Museum_2F_EventScript_16A553:: @ 816A553 - msgbox gUnknown_8190B30, 2 + msgbox gUnknown_8190B30, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A55C:: @ 816A55C - msgbox gUnknown_8190B80, 2 + msgbox gUnknown_8190B80, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A565:: @ 816A565 - msgbox gUnknown_8190BF3, 2 + msgbox gUnknown_8190BF3, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A56E:: @ 816A56E - msgbox gUnknown_8190C1E, 2 + msgbox gUnknown_8190C1E, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A577:: @ 816A577 - msgbox gUnknown_8190C60, 2 + msgbox gUnknown_8190C60, MSGBOX_NPC end PewterCity_Museum_2F_EventScript_16A580:: @ 816A580 - msgbox gUnknown_8190C81, 3 + msgbox gUnknown_8190C81, MSGBOX_SIGN end PewterCity_Museum_2F_EventScript_16A589:: @ 816A589 - msgbox gUnknown_8190C8F, 3 + msgbox gUnknown_8190C8F, MSGBOX_SIGN end diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index d8e30aff3..ababfb549 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -15,7 +15,7 @@ PewterCity_PokemonCenter_1F_EventScript_16A76F:: @ 816A76F end PewterCity_PokemonCenter_1F_EventScript_16A778:: @ 816A778 - msgbox gUnknown_81916A9, 2 + msgbox gUnknown_81916A9, MSGBOX_NPC end PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781 @@ -31,7 +31,7 @@ PewterCity_PokemonCenter_1F_EventScript_16A781:: @ 816A781 end PewterCity_PokemonCenter_1F_EventScript_16A798:: @ 816A798 - msgbox gUnknown_8191701, 2 + msgbox gUnknown_8191701, MSGBOX_NPC end PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1 @@ -41,5 +41,5 @@ PewterCity_PokemonCenter_1F_EventScript_16A7A1:: @ 816A7A1 end PewterCity_PokemonCenter_1F_EventScript_16A7AC:: @ 816A7AC - msgbox gUnknown_8191780, 2 + msgbox gUnknown_8191780, MSGBOX_NPC end diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index 42fe1d0b1..6fd52bafc 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -23,10 +23,10 @@ PokemonMansion_1F_EventScript_162212:: @ 8162212 PokemonMansion_1F_EventScript_162226:: @ 8162226 trainerbattle_single TRAINER_SCIENTIST_TED, Text_177364, Text_177391 - msgbox gUnknown_8177397, 6 + msgbox gUnknown_8177397, MSGBOX_AUTOCLOSE end PokemonMansion_1F_EventScript_16223D:: @ 816223D trainerbattle_single TRAINER_YOUNGSTER_JOHNSON, Text_1773C6, Text_1773FD - msgbox gUnknown_8177418, 6 + msgbox gUnknown_8177418, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index bc80d5344..e19c2ed7f 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -17,14 +17,14 @@ PokemonMansion_2F_EventScript_162264:: @ 8162264 end PokemonMansion_2F_EventScript_162278:: @ 8162278 - msgbox gUnknown_817751F, 3 + msgbox gUnknown_817751F, MSGBOX_SIGN end PokemonMansion_2F_EventScript_162281:: @ 8162281 - msgbox gUnknown_8177574, 3 + msgbox gUnknown_8177574, MSGBOX_SIGN end PokemonMansion_2F_EventScript_16228A:: @ 816228A trainerbattle_single TRAINER_BURGLAR_ARNIE, Text_177498, Text_1774CB - msgbox gUnknown_81774E3, 6 + msgbox gUnknown_81774E3, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index ff194f1ec..fe6eefcb0 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -17,15 +17,15 @@ PokemonMansion_3F_EventScript_1622B1:: @ 81622B1 end PokemonMansion_3F_EventScript_1622C5:: @ 81622C5 - msgbox gUnknown_8177685, 3 + msgbox gUnknown_8177685, MSGBOX_SIGN end PokemonMansion_3F_EventScript_1622CE:: @ 81622CE trainerbattle_single TRAINER_BURGLAR_SIMON, Text_1775E7, Text_177602 - msgbox gUnknown_8177608, 6 + msgbox gUnknown_8177608, MSGBOX_AUTOCLOSE end PokemonMansion_3F_EventScript_1622E5:: @ 81622E5 trainerbattle_single TRAINER_SCIENTIST_BRAYDON, Text_177628, Text_177643 - msgbox gUnknown_8177657, 6 + msgbox gUnknown_8177657, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index db087a466..d1641f28a 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -17,15 +17,15 @@ PokemonMansion_B1F_EventScript_16230C:: @ 816230C end PokemonMansion_B1F_EventScript_162320:: @ 8162320 - msgbox gUnknown_8177798, 3 + msgbox gUnknown_8177798, MSGBOX_SIGN end PokemonMansion_B1F_EventScript_162329:: @ 8162329 trainerbattle_single TRAINER_BURGLAR_LEWIS, Text_1776C0, Text_1776D7 - msgbox gUnknown_81776DE, 6 + msgbox gUnknown_81776DE, MSGBOX_AUTOCLOSE end PokemonMansion_B1F_EventScript_162340:: @ 8162340 trainerbattle_single TRAINER_SCIENTIST_IVAN, Text_177720, Text_177757 - msgbox gUnknown_817776A, 6 + msgbox gUnknown_817776A, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index 01686671a..961468138 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -7,15 +7,15 @@ PokemonTower_1F_OnTransition:: @ 816323B end PokemonTower_1F_EventScript_16323F:: @ 816323F - msgbox gUnknown_8179CAB, 2 + msgbox gUnknown_8179CAB, MSGBOX_NPC end PokemonTower_1F_EventScript_163248:: @ 8163248 - msgbox gUnknown_8179C8C, 2 + msgbox gUnknown_8179C8C, MSGBOX_NPC end PokemonTower_1F_EventScript_163251:: @ 8163251 - msgbox gUnknown_8179C41, 2 + msgbox gUnknown_8179C41, MSGBOX_NPC end PokemonTower_1F_EventScript_16325A:: @ 816325A @@ -34,5 +34,5 @@ EventScript_163272:: @ 8163272 end PokemonTower_1F_EventScript_16327C:: @ 816327C - msgbox gUnknown_8179B7A, 2 + msgbox gUnknown_8179B7A, MSGBOX_NPC end diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 802247402..7180936fb 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -2,7 +2,7 @@ PokemonTower_2F_MapScripts:: @ 8163285 .byte 0 PokemonTower_2F_EventScript_163286:: @ 8163286 - msgbox gUnknown_8179EAE, 2 + msgbox gUnknown_8179EAE, MSGBOX_NPC end PokemonTower_2F_EventScript_16328F:: @ 816328F diff --git a/data/maps/PokemonTower_3F/scripts.inc b/data/maps/PokemonTower_3F/scripts.inc index d38b39b66..a6a278554 100644 --- a/data/maps/PokemonTower_3F/scripts.inc +++ b/data/maps/PokemonTower_3F/scripts.inc @@ -3,15 +3,15 @@ PokemonTower_3F_MapScripts:: @ 81633A6 PokemonTower_3F_EventScript_1633A7:: @ 81633A7 trainerbattle_single TRAINER_CHANNELER_PATRICIA, Text_179FA0, Text_179FBC - msgbox gUnknown_8179FD3, 6 + msgbox gUnknown_8179FD3, MSGBOX_AUTOCLOSE end PokemonTower_3F_EventScript_1633BE:: @ 81633BE trainerbattle_single TRAINER_CHANNELER_CARLY, Text_179F62, Text_179F72 - msgbox gUnknown_8179F88, 6 + msgbox gUnknown_8179F88, MSGBOX_AUTOCLOSE end PokemonTower_3F_EventScript_1633D5:: @ 81633D5 trainerbattle_single TRAINER_CHANNELER_HOPE, Text_179F09, Text_179F21 - msgbox gUnknown_8179F31, 6 + msgbox gUnknown_8179F31, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc index c6745eb70..238e600e7 100644 --- a/data/maps/PokemonTower_4F/scripts.inc +++ b/data/maps/PokemonTower_4F/scripts.inc @@ -3,15 +3,15 @@ PokemonTower_4F_MapScripts:: @ 81633EC PokemonTower_4F_EventScript_1633ED:: @ 81633ED trainerbattle_single TRAINER_CHANNELER_PAULA, Text_17A004, Text_17A017 - msgbox gUnknown_817A02B, 6 + msgbox gUnknown_817A02B, MSGBOX_AUTOCLOSE end PokemonTower_4F_EventScript_163404:: @ 8163404 trainerbattle_single TRAINER_CHANNELER_LAUREL, Text_17A046, Text_17A061 - msgbox gUnknown_817A067, 6 + msgbox gUnknown_817A067, MSGBOX_AUTOCLOSE end PokemonTower_4F_EventScript_16341B:: @ 816341B trainerbattle_single TRAINER_CHANNELER_JODY, Text_17A096, Text_17A0AB - msgbox gUnknown_817A0BB, 6 + msgbox gUnknown_817A0BB, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index 156cfd038..c96354826 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -2,7 +2,7 @@ PokemonTower_5F_MapScripts:: @ 8163432 .byte 0 PokemonTower_5F_EventScript_163433:: @ 8163433 - msgbox gUnknown_817A0E3, 2 + msgbox gUnknown_817A0E3, MSGBOX_NPC end PokemonTower_5F_EventScript_16343C:: @ 816343C @@ -23,20 +23,20 @@ PokemonTower_5F_EventScript_163453:: @ 8163453 PokemonTower_5F_EventScript_16345B:: @ 816345B trainerbattle_single TRAINER_CHANNELER_TAMMY, Text_17A11F, Text_17A132 - msgbox gUnknown_817A138, 6 + msgbox gUnknown_817A138, MSGBOX_AUTOCLOSE end PokemonTower_5F_EventScript_163472:: @ 8163472 trainerbattle_single TRAINER_CHANNELER_RUTH, Text_17A150, Text_17A164 - msgbox gUnknown_817A176, 6 + msgbox gUnknown_817A176, MSGBOX_AUTOCLOSE end PokemonTower_5F_EventScript_163489:: @ 8163489 trainerbattle_single TRAINER_CHANNELER_KARINA, Text_17A187, Text_17A190 - msgbox gUnknown_817A194, 6 + msgbox gUnknown_817A194, MSGBOX_AUTOCLOSE end PokemonTower_5F_EventScript_1634A0:: @ 81634A0 trainerbattle_single TRAINER_CHANNELER_JANAE, Text_17A1AA, Text_17A1B7 - msgbox gUnknown_817A1BD, 6 + msgbox gUnknown_817A1BD, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 3d74508e6..8f4500615 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -37,15 +37,15 @@ Movement_163512:: @ 8163512 PokemonTower_6F_EventScript_163514:: @ 8163514 trainerbattle_single TRAINER_CHANNELER_ANGELICA, Text_17A243, Text_17A253 - msgbox gUnknown_817A25A, 6 + msgbox gUnknown_817A25A, MSGBOX_AUTOCLOSE end PokemonTower_6F_EventScript_16352B:: @ 816352B trainerbattle_single TRAINER_CHANNELER_EMILIA, Text_17A272, Text_17A27F - msgbox gUnknown_817A293, 6 + msgbox gUnknown_817A293, MSGBOX_AUTOCLOSE end PokemonTower_6F_EventScript_163542:: @ 8163542 trainerbattle_single TRAINER_CHANNELER_JENNIFER, Text_17A2C8, Text_17A2DC - msgbox gUnknown_817A2E2, 6 + msgbox gUnknown_817A2E2, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 5ce28e764..9f7986523 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -17,7 +17,7 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A PokemonTower_7F_EventScript_163586:: @ 8163586 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_19, Text_17A380, Text_17A3A4, EventScript_1635A1 - msgbox gUnknown_817A3AF, 6 + msgbox gUnknown_817A3AF, MSGBOX_AUTOCLOSE end EventScript_1635A1:: @ 81635A1 @@ -104,7 +104,7 @@ Movement_163633:: @ 8163633 PokemonTower_7F_EventScript_16363D:: @ 816363D trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_20, Text_17A3CD, Text_17A466, EventScript_163658 - msgbox gUnknown_817A477, 6 + msgbox gUnknown_817A477, MSGBOX_AUTOCLOSE end EventScript_163658:: @ 8163658 @@ -170,7 +170,7 @@ Movement_1636CD:: @ 81636CD PokemonTower_7F_EventScript_1636D6:: @ 81636D6 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_21, Text_17A4CF, Text_17A4EE, EventScript_1636F1 - msgbox gUnknown_817A506, 6 + msgbox gUnknown_817A506, MSGBOX_AUTOCLOSE end EventScript_1636F1:: @ 81636F1 diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index 8049032dd..49daa21a7 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -7,40 +7,40 @@ RockTunnel_1F_OnTransition:: @ 8162DDC end RockTunnel_1F_EventScript_162DE0:: @ 8162DE0 - msgbox gUnknown_817962D, 3 + msgbox gUnknown_817962D, MSGBOX_SIGN end RockTunnel_1F_EventScript_162DE9:: @ 8162DE9 trainerbattle_single TRAINER_HIKER_LENNY, Text_179366, Text_179388 - msgbox gUnknown_8179396, 6 + msgbox gUnknown_8179396, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E00:: @ 8162E00 trainerbattle_single TRAINER_HIKER_OLIVER, Text_1793F1, Text_17940E - msgbox gUnknown_817943A, 6 + msgbox gUnknown_817943A, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E17:: @ 8162E17 trainerbattle_single TRAINER_HIKER_LUCAS, Text_17947B, Text_1794AC - msgbox gUnknown_81794B4, 6 + msgbox gUnknown_81794B4, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E2E:: @ 8162E2E trainerbattle_single TRAINER_POKEMANIAC_ASHTON, Text_1794D4, Text_1794EE - msgbox gUnknown_81794F9, 6 + msgbox gUnknown_81794F9, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E45:: @ 8162E45 trainerbattle_single TRAINER_PICNICKER_LEAH, Text_17951C, Text_179547 - msgbox gUnknown_8179558, 6 + msgbox gUnknown_8179558, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E5C:: @ 8162E5C trainerbattle_single TRAINER_PICNICKER_ARIANA, Text_1795E5, Text_179604 - msgbox gUnknown_8179613, 6 + msgbox gUnknown_8179613, MSGBOX_AUTOCLOSE end RockTunnel_1F_EventScript_162E73:: @ 8162E73 trainerbattle_single TRAINER_PICNICKER_DANA, Text_179577, Text_1795A1 - msgbox gUnknown_81795B5, 6 + msgbox gUnknown_81795B5, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc index 39cf01a9b..e2c34b53e 100644 --- a/data/maps/RockTunnel_B1F/scripts.inc +++ b/data/maps/RockTunnel_B1F/scripts.inc @@ -3,40 +3,40 @@ RockTunnel_B1F_MapScripts:: @ 8162E8A RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B trainerbattle_single TRAINER_PICNICKER_SOFIA, Text_179657, Text_1796B9 - msgbox gUnknown_81796CE, 6 + msgbox gUnknown_81796CE, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2 trainerbattle_single TRAINER_PICNICKER_MARTHA, Text_1798AD, Text_1798DD - msgbox gUnknown_81798E9, 6 + msgbox gUnknown_81798E9, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9 trainerbattle_single TRAINER_HIKER_DUDLEY, Text_1796E1, Text_179700 - msgbox gUnknown_8179712, 6 + msgbox gUnknown_8179712, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0 trainerbattle_single TRAINER_HIKER_ALLEN, Text_179829, Text_179856 - msgbox gUnknown_817987A, 6 + msgbox gUnknown_817987A, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7 trainerbattle_single TRAINER_HIKER_ERIC, Text_179916, Text_179932 - msgbox gUnknown_817993E, 6 + msgbox gUnknown_817993E, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE trainerbattle_single TRAINER_POKEMANIAC_COOPER, Text_17973A, Text_17975F - msgbox gUnknown_8179777, 6 + msgbox gUnknown_8179777, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162F15:: @ 8162F15 trainerbattle_single TRAINER_POKEMANIAC_STEVE, Text_1797A4, Text_1797CB - msgbox gUnknown_81797DE, 6 + msgbox gUnknown_81797DE, MSGBOX_AUTOCLOSE end RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C trainerbattle_single TRAINER_POKEMANIAC_WINSTON, Text_179968, Text_179997 - msgbox gUnknown_81799AC, 6 + msgbox gUnknown_81799AC, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index a5158b6f3..e9f52ceef 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -14,27 +14,27 @@ RocketHideout_B1F_OnTransition:: @ 81611AA RocketHideout_B1F_EventScript_1611AE:: @ 81611AE trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, Text_174ECA, Text_174EED - msgbox gUnknown_8174EFA, 6 + msgbox gUnknown_8174EFA, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_1611C5:: @ 81611C5 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, Text_174F2C, Text_174F60 - msgbox gUnknown_8174F66, 6 + msgbox gUnknown_8174F66, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_1611DC:: @ 81611DC trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, Text_174F94, Text_174FA4 - msgbox gUnknown_8174FB3, 6 + msgbox gUnknown_8174FB3, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_1611F3:: @ 81611F3 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, Text_174FE1, Text_174FF8 - msgbox gUnknown_8175007, 6 + msgbox gUnknown_8175007, MSGBOX_AUTOCLOSE end RocketHideout_B1F_EventScript_16120A:: @ 816120A trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, Text_17503A, Text_17505A, EventScript_161225 - msgbox gUnknown_8175060, 6 + msgbox gUnknown_8175060, MSGBOX_AUTOCLOSE end EventScript_161225:: @ 8161225 diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc index 9e6338f9c..07916ad03 100644 --- a/data/maps/RocketHideout_B2F/scripts.inc +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -3,5 +3,5 @@ RocketHideout_B2F_MapScripts:: @ 81612A1 RocketHideout_B2F_EventScript_1612A2:: @ 81612A2 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, Text_17508C, Text_1750BF - msgbox gUnknown_81750CC, 6 + msgbox gUnknown_81750CC, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index 962aa3385..d6a57ab77 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -3,10 +3,10 @@ RocketHideout_B3F_MapScripts:: @ 81612B9 RocketHideout_B3F_EventScript_1612BA:: @ 81612BA trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, Text_17511A, Text_17514A - msgbox gUnknown_817515B, 6 + msgbox gUnknown_817515B, MSGBOX_AUTOCLOSE end RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, Text_17519E, Text_1751CE - msgbox gUnknown_81751E0, 6 + msgbox gUnknown_81751E0, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 2324e6fc6..ab1fb6865 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -73,7 +73,7 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD RocketHideout_B4F_EventScript_1613CE:: @ 81613CE trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, Text_1753D0, Text_1753FE, EventScript_1613E9 - msgbox gUnknown_817540C, 6 + msgbox gUnknown_817540C, MSGBOX_AUTOCLOSE end EventScript_1613E9:: @ 81613E9 @@ -91,7 +91,7 @@ EventScript_1613E9:: @ 81613E9 RocketHideout_B4F_EventScript_161418:: @ 8161418 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, Text_175437, Text_175463, EventScript_161433 - msgbox gUnknown_817546A, 6 + msgbox gUnknown_817546A, MSGBOX_AUTOCLOSE end EventScript_161433:: @ 8161433 diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index 96e12e7da..e4f5feb16 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -28,9 +28,9 @@ EventScript_167F48:: @ 8167F48 end Route1_EventScript_167F52:: @ 8167F52 - msgbox gUnknown_81833B9, 2 + msgbox gUnknown_81833B9, MSGBOX_NPC end Route1_EventScript_167F5B:: @ 8167F5B - msgbox gUnknown_818343A, 3 + msgbox gUnknown_818343A, MSGBOX_SIGN end diff --git a/data/maps/Route10/scripts.inc b/data/maps/Route10/scripts.inc index 96ce99c8e..7fb5d64cd 100644 --- a/data/maps/Route10/scripts.inc +++ b/data/maps/Route10/scripts.inc @@ -5,13 +5,13 @@ Route10_EventScript_167FDA:: @ 8167FDA end Route10_EventScript_167FDB:: @ 8167FDB - msgbox gUnknown_8184EC5, 3 + msgbox gUnknown_8184EC5, MSGBOX_SIGN end Route10_EventScript_167FE4:: @ 8167FE4 - msgbox gUnknown_8184EE9, 3 + msgbox gUnknown_8184EE9, MSGBOX_SIGN end Route10_EventScript_167FED:: @ 8167FED - msgbox gUnknown_8184EF5, 3 + msgbox gUnknown_8184EF5, MSGBOX_SIGN end diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 32864b8fb..e902a3896 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -16,15 +16,15 @@ Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41 end Route10_PokemonCenter_1F_EventScript_16FC4A:: @ 816FC4A - msgbox gUnknown_819E59D, 2 + msgbox gUnknown_819E59D, MSGBOX_NPC end Route10_PokemonCenter_1F_EventScript_16FC53:: @ 816FC53 - msgbox gUnknown_819E523, 2 + msgbox gUnknown_819E523, MSGBOX_NPC end Route10_PokemonCenter_1F_EventScript_16FC5C:: @ 816FC5C - msgbox gUnknown_819E5D2, 2 + msgbox gUnknown_819E5D2, MSGBOX_NPC end Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 @@ -33,7 +33,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 call EventScript_16FCF1 goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7 msgbox gUnknown_819E5FB, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount diff --git a/data/maps/Route11/scripts.inc b/data/maps/Route11/scripts.inc index fa85a5bb8..11f052030 100644 --- a/data/maps/Route11/scripts.inc +++ b/data/maps/Route11/scripts.inc @@ -2,5 +2,5 @@ Route11_MapScripts:: @ 8167FF6 .byte 0 Route11_EventScript_167FF7:: @ 8167FF7 - msgbox gUnknown_8185308, 3 + msgbox gUnknown_8185308, MSGBOX_SIGN end diff --git a/data/maps/Route11_EastEntrance_1F/scripts.inc b/data/maps/Route11_EastEntrance_1F/scripts.inc index 476379753..0a2f2cb75 100644 --- a/data/maps/Route11_EastEntrance_1F/scripts.inc +++ b/data/maps/Route11_EastEntrance_1F/scripts.inc @@ -2,9 +2,9 @@ Route11_EastEntrance_1F_MapScripts:: @ 816FD21 .byte 0 Route11_EastEntrance_1F_EventScript_16FD22:: @ 816FD22 - msgbox gUnknown_819E8A6, 2 + msgbox gUnknown_819E8A6, MSGBOX_NPC end Route11_EastEntrance_1F_EventScript_16FD2B:: @ 816FD2B - msgbox gUnknown_819E97B, 2 + msgbox gUnknown_819E97B, MSGBOX_NPC end diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 28222d32a..ec61893ec 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -14,7 +14,7 @@ EventScript_16FD49:: @ 816FD49 end Route11_EastEntrance_2F_EventScript_16FD53:: @ 816FD53 - msgbox gUnknown_819ED1F, 3 + msgbox gUnknown_819ED1F, MSGBOX_SIGN end Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C @@ -24,7 +24,7 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C call EventScript_1A8CAD goto_if_set FLAG_DID_NINA_TRADE, EventScript_16FDCE msgbox gUnknown_81A597B, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16FDB6 call EventScript_1A8CBD compare VAR_0x8004, 6 @@ -60,7 +60,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 call EventScript_16FE64 goto_if_set FLAG_GOT_ITEMFINDER, EventScript_16FE5A msgbox gUnknown_819E9E5, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 5aa50bfc1..fe21ac1d2 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -19,7 +19,7 @@ Route12_EventScript_168014:: @ 8168014 goto_if_eq EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16808D call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE @@ -57,9 +57,9 @@ EventScript_168099:: @ 8168099 end Route12_EventScript_1680A3:: @ 81680A3 - msgbox gUnknown_8185797, 3 + msgbox gUnknown_8185797, MSGBOX_SIGN end Route12_EventScript_1680AC:: @ 81680AC - msgbox gUnknown_81857B3, 3 + msgbox gUnknown_81857B3, MSGBOX_SIGN end diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index d69b1a68a..8421e5ffa 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -6,7 +6,7 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C faceplayer goto_if_set FLAG_GOT_SUPER_ROD, EventScript_16FF7F msgbox gUnknown_819EFE0, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16FF34 msgbox gUnknown_819F1FA release diff --git a/data/maps/Route12_NorthEntrance_1F/scripts.inc b/data/maps/Route12_NorthEntrance_1F/scripts.inc index d91f0c7c8..990d5f793 100644 --- a/data/maps/Route12_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_1F/scripts.inc @@ -2,5 +2,5 @@ Route12_NorthEntrance_1F_MapScripts:: @ 816FE6D .byte 0 Route12_NorthEntrance_1F_EventScript_16FE6E:: @ 816FE6E - msgbox gUnknown_819EDA7, 2 + msgbox gUnknown_819EDA7, MSGBOX_NPC end diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index 1c6014110..e56f096f6 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -2,11 +2,11 @@ Route12_NorthEntrance_2F_MapScripts:: @ 816FE77 .byte 0 Route12_NorthEntrance_2F_EventScript_16FE78:: @ 816FE78 - msgbox gUnknown_819EF5D, 3 + msgbox gUnknown_819EF5D, MSGBOX_SIGN end Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81 - msgbox gUnknown_819EFA0, 3 + msgbox gUnknown_819EFA0, MSGBOX_SIGN end Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A diff --git a/data/maps/Route13/scripts.inc b/data/maps/Route13/scripts.inc index fcec8204a..6524d5dd6 100644 --- a/data/maps/Route13/scripts.inc +++ b/data/maps/Route13/scripts.inc @@ -2,13 +2,13 @@ Route13_MapScripts:: @ 81680B5 .byte 0 Route13_EventScript_1680B6:: @ 81680B6 - msgbox gUnknown_8185DB7, 3 + msgbox gUnknown_8185DB7, MSGBOX_SIGN end Route13_EventScript_1680BF:: @ 81680BF - msgbox gUnknown_8185DEF, 3 + msgbox gUnknown_8185DEF, MSGBOX_SIGN end Route13_EventScript_1680C8:: @ 81680C8 - msgbox gUnknown_8185E2C, 3 + msgbox gUnknown_8185E2C, MSGBOX_SIGN end diff --git a/data/maps/Route14/scripts.inc b/data/maps/Route14/scripts.inc index 207604cdc..551940250 100644 --- a/data/maps/Route14/scripts.inc +++ b/data/maps/Route14/scripts.inc @@ -2,5 +2,5 @@ Route14_MapScripts:: @ 81680D1 .byte 0 Route14_EventScript_1680D2:: @ 81680D2 - msgbox gUnknown_8186399, 3 + msgbox gUnknown_8186399, MSGBOX_SIGN end diff --git a/data/maps/Route15/scripts.inc b/data/maps/Route15/scripts.inc index a4d0a3240..40890250c 100644 --- a/data/maps/Route15/scripts.inc +++ b/data/maps/Route15/scripts.inc @@ -2,5 +2,5 @@ Route15_MapScripts:: @ 81680DB .byte 0 Route15_EventScript_1680DC:: @ 81680DC - msgbox gUnknown_8186A77, 3 + msgbox gUnknown_8186A77, MSGBOX_SIGN end diff --git a/data/maps/Route15_WestEntrance_1F/scripts.inc b/data/maps/Route15_WestEntrance_1F/scripts.inc index 458f5e010..9f753e6c9 100644 --- a/data/maps/Route15_WestEntrance_1F/scripts.inc +++ b/data/maps/Route15_WestEntrance_1F/scripts.inc @@ -2,5 +2,5 @@ Route15_WestEntrance_1F_MapScripts:: @ 8170088 .byte 0 Route15_WestEntrance_1F_EventScript_170089:: @ 8170089 - msgbox gUnknown_819F560, 2 + msgbox gUnknown_819F560, MSGBOX_NPC end diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 3968fc32d..8bd966692 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -14,7 +14,7 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 end Route15_WestEntrance_2F_EventScript_1700B0:: @ 81700B0 - msgbox gUnknown_819F7F8, 3 + msgbox gUnknown_819F7F8, MSGBOX_SIGN end Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 @@ -23,7 +23,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 call EventScript_170145 goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, EventScript_17013B msgbox gUnknown_819F5AB, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 837ad0fc7..135858798 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -38,7 +38,7 @@ Route16_EventScript_168121:: @ 8168121 goto_if_eq EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_168197 call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE @@ -75,9 +75,9 @@ EventScript_1681A3:: @ 81681A3 end Route16_EventScript_1681AD:: @ 81681AD - msgbox gUnknown_8186F7A, 3 + msgbox gUnknown_8186F7A, MSGBOX_SIGN end Route16_EventScript_1681B6:: @ 81681B6 - msgbox gUnknown_8186F98, 3 + msgbox gUnknown_8186F98, MSGBOX_SIGN end diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index a8abfb255..a99a1ec18 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -12,7 +12,7 @@ EventScript_1701D5:: @ 81701D5 return Route16_NorthEntrance_1F_EventScript_1701DB:: @ 81701DB - msgbox gUnknown_819F98B, 2 + msgbox gUnknown_819F98B, MSGBOX_NPC end Route16_NorthEntrance_1F_EventScript_1701E4:: @ 81701E4 @@ -114,5 +114,5 @@ Movement_1702B3:: @ 81702B3 step_end Route16_NorthEntrance_1F_EventScript_1702B5:: @ 81702B5 - msgbox gUnknown_819F9E8, 2 + msgbox gUnknown_819F9E8, MSGBOX_NPC end diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 9b2dd6737..18c15c1e2 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -2,19 +2,19 @@ Route16_NorthEntrance_2F_MapScripts:: @ 81702BE .byte 0 Route16_NorthEntrance_2F_EventScript_1702BF:: @ 81702BF - msgbox gUnknown_819FA07, 2 + msgbox gUnknown_819FA07, MSGBOX_NPC end Route16_NorthEntrance_2F_EventScript_1702C8:: @ 81702C8 - msgbox gUnknown_819FA41, 2 + msgbox gUnknown_819FA41, MSGBOX_NPC end Route16_NorthEntrance_2F_EventScript_1702D1:: @ 81702D1 - msgbox gUnknown_819FA6F, 3 + msgbox gUnknown_819FA6F, MSGBOX_SIGN end Route16_NorthEntrance_2F_EventScript_1702DA:: @ 81702DA - msgbox gUnknown_819FAB9, 3 + msgbox gUnknown_819FAB9, MSGBOX_SIGN end Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 @@ -23,7 +23,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 call EventScript_17036F goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365 msgbox gUnknown_819FB0E, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount diff --git a/data/maps/Route17/scripts.inc b/data/maps/Route17/scripts.inc index 12d99102a..8633ab23e 100644 --- a/data/maps/Route17/scripts.inc +++ b/data/maps/Route17/scripts.inc @@ -2,25 +2,25 @@ Route17_MapScripts:: @ 81681BF .byte 0 Route17_EventScript_1681C0:: @ 81681C0 - msgbox gUnknown_81874E4, 3 + msgbox gUnknown_81874E4, MSGBOX_SIGN end Route17_EventScript_1681C9:: @ 81681C9 - msgbox gUnknown_8187512, 3 + msgbox gUnknown_8187512, MSGBOX_SIGN end Route17_EventScript_1681D2:: @ 81681D2 - msgbox gUnknown_818757B, 3 + msgbox gUnknown_818757B, MSGBOX_SIGN end Route17_EventScript_1681DB:: @ 81681DB - msgbox gUnknown_81875BE, 3 + msgbox gUnknown_81875BE, MSGBOX_SIGN end Route17_EventScript_1681E4:: @ 81681E4 - msgbox gUnknown_81875E3, 3 + msgbox gUnknown_81875E3, MSGBOX_SIGN end Route17_EventScript_1681ED:: @ 81681ED - msgbox gUnknown_8187622, 3 + msgbox gUnknown_8187622, MSGBOX_SIGN end diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index c988ccb1b..25fda03c2 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -21,9 +21,9 @@ EventScript_16821B:: @ 816821B end Route18_EventScript_16821F:: @ 816821F - msgbox gUnknown_8187757, 3 + msgbox gUnknown_8187757, MSGBOX_SIGN end Route18_EventScript_168228:: @ 8168228 - msgbox gUnknown_818777C, 3 + msgbox gUnknown_818777C, MSGBOX_SIGN end diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 8e8b8a531..e49eb285f 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -12,7 +12,7 @@ EventScript_17038B:: @ 817038B return Route18_EastEntrance_1F_EventScript_170391:: @ 8170391 - msgbox gUnknown_819FD3A, 2 + msgbox gUnknown_819FD3A, MSGBOX_NPC end Route18_EastEntrance_1F_EventScript_17039A:: @ 817039A diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index 8878cfa1f..83c79b9ae 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -2,11 +2,11 @@ Route18_EastEntrance_2F_MapScripts:: @ 817046B .byte 0 Route18_EastEntrance_2F_EventScript_17046C:: @ 817046C - msgbox gUnknown_819FD6B, 3 + msgbox gUnknown_819FD6B, MSGBOX_SIGN end Route18_EastEntrance_2F_EventScript_170475:: @ 8170475 - msgbox gUnknown_819FDB3, 3 + msgbox gUnknown_819FDB3, MSGBOX_SIGN end Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E @@ -16,7 +16,7 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E call EventScript_1A8CAD goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1704D8 call EventScript_1A8CBD compare VAR_0x8004, 6 diff --git a/data/maps/Route19/scripts.inc b/data/maps/Route19/scripts.inc index 28a71830d..16d6e4669 100644 --- a/data/maps/Route19/scripts.inc +++ b/data/maps/Route19/scripts.inc @@ -2,5 +2,5 @@ Route19_MapScripts:: @ 8168231 .byte 0 Route19_EventScript_168232:: @ 8168232 - msgbox gUnknown_8187C06, 3 + msgbox gUnknown_8187C06, MSGBOX_SIGN end diff --git a/data/maps/Route2/scripts.inc b/data/maps/Route2/scripts.inc index 67ba5729e..75a3dd87b 100644 --- a/data/maps/Route2/scripts.inc +++ b/data/maps/Route2/scripts.inc @@ -2,9 +2,9 @@ Route2_MapScripts:: @ 8167F64 .byte 0 Route2_EventScript_167F65:: @ 8167F65 - msgbox gUnknown_818345E, 3 + msgbox gUnknown_818345E, MSGBOX_SIGN end Route2_EventScript_167F6E:: @ 8167F6E - msgbox gUnknown_8183482, 3 + msgbox gUnknown_8183482, MSGBOX_SIGN end diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index 2131ca106..a034c3610 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -28,5 +28,5 @@ EventScript_16826D:: @ 816826D return Route20_EventScript_168280:: @ 8168280 - msgbox gUnknown_81882D1, 3 + msgbox gUnknown_81882D1, MSGBOX_SIGN end diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 58380f0e9..8036883f3 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -257,5 +257,5 @@ Movement_1684DA:: @ 81684DA step_end Route22_EventScript_1684E2:: @ 81684E2 - msgbox gUnknown_8188BFF, 3 + msgbox gUnknown_8188BFF, MSGBOX_SIGN end diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index 4a3fcaf60..b5c8da4f3 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -124,5 +124,5 @@ Route23_EventScript_168601:: @ 8168601 end Route23_EventScript_168616:: @ 8168616 - msgbox gUnknown_8188C19, 3 + msgbox gUnknown_8188C19, MSGBOX_SIGN end diff --git a/data/maps/Route25/scripts.inc b/data/maps/Route25/scripts.inc index 81b2704d4..d214cdbf6 100644 --- a/data/maps/Route25/scripts.inc +++ b/data/maps/Route25/scripts.inc @@ -2,9 +2,9 @@ Route25_MapScripts:: @ 8168745 .byte 0 Route25_EventScript_168746:: @ 8168746 - msgbox gUnknown_818954C, 3 + msgbox gUnknown_818954C, MSGBOX_SIGN end Route25_EventScript_16874F:: @ 816874F - msgbox gUnknown_81895C2, 2 + msgbox gUnknown_81895C2, MSGBOX_NPC end diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 1a35552e4..725728930 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -40,7 +40,7 @@ EventScript_17058E:: @ 817058E end EventScript_17059C:: @ 817059C - compare VAR_RESULT, 0 + compare VAR_RESULT, NO call_if_eq EventScript_170600 msgbox gUnknown_819FFD3 closemessage diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index dec1a7e0c..7b9f92e44 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -7,7 +7,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F call EventScript_16F70B goto_if_set FLAG_GOT_HM05, EventScript_16F701 msgbox gUnknown_819D64F, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount @@ -36,5 +36,5 @@ EventScript_16F70B:: @ 816F70B return Route2_EastBuilding_EventScript_16F714:: @ 816F714 - msgbox gUnknown_819D81E, 2 + msgbox gUnknown_819D81E, MSGBOX_NPC end diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 5b92d8298..f4bc2d0ed 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -2,7 +2,7 @@ Route2_House_MapScripts:: @ 816F5F8 .byte 0 Route2_House_EventScript_16F5F9:: @ 816F5F9 - msgbox gUnknown_819D5E7, 2 + msgbox gUnknown_819D5E7, MSGBOX_NPC end Route2_House_EventScript_16F602:: @ 816F602 @@ -12,7 +12,7 @@ Route2_House_EventScript_16F602:: @ 816F602 call EventScript_1A8CAD goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674 msgbox gUnknown_81A597B, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16F65C call EventScript_1A8CBD compare VAR_0x8004, 6 diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc index 6ed3f355a..29e6bd757 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc +++ b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc @@ -2,13 +2,13 @@ Route2_ViridianForest_NorthEntrance_MapScripts:: @ 816F71D .byte 0 Route2_ViridianForest_NorthEntrance_EventScript_16F71E:: @ 816F71E - msgbox gUnknown_819D85C, 2 + msgbox gUnknown_819D85C, MSGBOX_NPC end Route2_ViridianForest_NorthEntrance_EventScript_16F727:: @ 816F727 - msgbox gUnknown_819D8D0, 2 + msgbox gUnknown_819D8D0, MSGBOX_NPC end Route2_ViridianForest_NorthEntrance_EventScript_16F730:: @ 816F730 - msgbox gUnknown_819D93B, 2 + msgbox gUnknown_819D93B, MSGBOX_NPC end diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc index a8aba4941..aea8bfaa4 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc +++ b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc @@ -2,9 +2,9 @@ Route2_ViridianForest_SouthEntrance_MapScripts:: @ 816F5E5 .byte 0 Route2_ViridianForest_SouthEntrance_EventScript_16F5E6:: @ 816F5E6 - msgbox gUnknown_819D52C, 2 + msgbox gUnknown_819D52C, MSGBOX_NPC end Route2_ViridianForest_SouthEntrance_EventScript_16F5EF:: @ 816F5EF - msgbox gUnknown_819D58B, 2 + msgbox gUnknown_819D58B, MSGBOX_NPC end diff --git a/data/maps/Route3/scripts.inc b/data/maps/Route3/scripts.inc index 7bf593794..bc44936d0 100644 --- a/data/maps/Route3/scripts.inc +++ b/data/maps/Route3/scripts.inc @@ -2,9 +2,9 @@ Route3_MapScripts:: @ 8167F77 .byte 0 Route3_EventScript_167F78:: @ 8167F78 - msgbox gUnknown_8183491, 2 + msgbox gUnknown_8183491, MSGBOX_NPC end Route3_EventScript_167F81:: @ 8167F81 - msgbox gUnknown_81838C0, 3 + msgbox gUnknown_81838C0, MSGBOX_SIGN end diff --git a/data/maps/Route4/scripts.inc b/data/maps/Route4/scripts.inc index 230c13d3b..9055722eb 100644 --- a/data/maps/Route4/scripts.inc +++ b/data/maps/Route4/scripts.inc @@ -5,13 +5,13 @@ Route4_EventScript_167F8B:: @ 8167F8B end Route4_EventScript_167F8C:: @ 8167F8C - msgbox gUnknown_81838D7, 2 + msgbox gUnknown_81838D7, MSGBOX_NPC end Route4_EventScript_167F95:: @ 8167F95 - msgbox gUnknown_818399B, 3 + msgbox gUnknown_818399B, MSGBOX_SIGN end Route4_EventScript_167F9E:: @ 8167F9E - msgbox gUnknown_81839B4, 3 + msgbox gUnknown_81839B4, MSGBOX_SIGN end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index bb8294e6d..7e236951a 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -9,7 +9,7 @@ Route4_PokemonCenter_1F_OnTransition:: @ 816F744 end Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B - msgbox gUnknown_819D9D4, 2 + msgbox gUnknown_819D9D4, MSGBOX_NPC end Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 @@ -41,7 +41,7 @@ EventScript_16F794:: @ 816F794 end EventScript_16F7A2:: @ 816F7A2 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16F888 checkmoney 500, 0 compare VAR_RESULT, 0 @@ -60,7 +60,7 @@ EventScript_16F7A2:: @ 816F7A2 EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16F861 call EventScript_1A8C27 fadescreen 1 @@ -73,7 +73,7 @@ EventScript_16F7F6:: @ 816F7F6 EventScript_16F822:: @ 816F822 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16F84B fadescreen 1 hidemoneybox 0, 0 @@ -146,7 +146,7 @@ Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB end Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4 - msgbox gUnknown_819DCDB, 2 + msgbox gUnknown_819DCDB, MSGBOX_NPC end Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD diff --git a/data/maps/Route5/scripts.inc b/data/maps/Route5/scripts.inc index 8356751b7..3e1b507d2 100644 --- a/data/maps/Route5/scripts.inc +++ b/data/maps/Route5/scripts.inc @@ -2,5 +2,5 @@ Route5_MapScripts:: @ 8167FA7 .byte 0 Route5_EventScript_167FA8:: @ 8167FA8 - msgbox gUnknown_8183DD4, 3 + msgbox gUnknown_8183DD4, MSGBOX_SIGN end diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index ca7a34e0c..f20da71ae 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -2,7 +2,7 @@ Route5_SouthEntrance_MapScripts:: @ 816F900 .byte 0 Route5_SouthEntrance_EventScript_16F901:: @ 816F901 - msgbox gUnknown_819E16D, 2 + msgbox gUnknown_819E16D, MSGBOX_NPC end Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A diff --git a/data/maps/Route6/scripts.inc b/data/maps/Route6/scripts.inc index 773e1c091..00b3efb56 100644 --- a/data/maps/Route6/scripts.inc +++ b/data/maps/Route6/scripts.inc @@ -2,5 +2,5 @@ Route6_MapScripts:: @ 8167FB1 .byte 0 Route6_EventScript_167FB2:: @ 8167FB2 - msgbox gUnknown_8184067, 3 + msgbox gUnknown_8184067, MSGBOX_SIGN end diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 393c7ee6a..d1b9a4555 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -2,7 +2,7 @@ Route6_NorthEntrance_MapScripts:: @ 816F9C6 .byte 0 Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7 - msgbox gUnknown_819E2A3, 2 + msgbox gUnknown_819E2A3, MSGBOX_NPC end Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0 diff --git a/data/maps/Route7/scripts.inc b/data/maps/Route7/scripts.inc index ec34892f4..52d0f5f36 100644 --- a/data/maps/Route7/scripts.inc +++ b/data/maps/Route7/scripts.inc @@ -2,5 +2,5 @@ Route7_MapScripts:: @ 8167FBB .byte 0 Route7_EventScript_167FBC:: @ 8167FBC - msgbox gUnknown_8184097, 3 + msgbox gUnknown_8184097, MSGBOX_SIGN end diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index 17ac82ef8..cac72463b 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -2,7 +2,7 @@ Route7_EastEntrance_MapScripts:: @ 816FA8D .byte 0 Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E - msgbox gUnknown_819E3D9, 2 + msgbox gUnknown_819E3D9, MSGBOX_NPC end Route7_EastEntrance_EventScript_16FA97:: @ 816FA97 diff --git a/data/maps/Route8/scripts.inc b/data/maps/Route8/scripts.inc index d2bc3749b..c0f7475f3 100644 --- a/data/maps/Route8/scripts.inc +++ b/data/maps/Route8/scripts.inc @@ -2,5 +2,5 @@ Route8_MapScripts:: @ 8167FC5 .byte 0 Route8_EventScript_167FC6:: @ 8167FC6 - msgbox gUnknown_8184576, 3 + msgbox gUnknown_8184576, MSGBOX_SIGN end diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index 0ce1d1f69..df9d1035c 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -2,7 +2,7 @@ Route8_WestEntrance_MapScripts:: @ 816FB53 .byte 0 Route8_WestEntrance_EventScript_16FB54:: @ 816FB54 - msgbox gUnknown_819E50F, 2 + msgbox gUnknown_819E50F, MSGBOX_NPC end Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D diff --git a/data/maps/Route9/scripts.inc b/data/maps/Route9/scripts.inc index 6c3b7927b..1b48cd68e 100644 --- a/data/maps/Route9/scripts.inc +++ b/data/maps/Route9/scripts.inc @@ -2,5 +2,5 @@ Route9_MapScripts:: @ 8167FCF .byte 0 Route9_EventScript_167FD0:: @ 8167FD0 - msgbox gUnknown_8184B66, 3 + msgbox gUnknown_8184B66, MSGBOX_SIGN end diff --git a/data/maps/SSAnne_1F_Corridor/scripts.inc b/data/maps/SSAnne_1F_Corridor/scripts.inc index d9bd8c051..21967cf04 100644 --- a/data/maps/SSAnne_1F_Corridor/scripts.inc +++ b/data/maps/SSAnne_1F_Corridor/scripts.inc @@ -2,9 +2,9 @@ SSAnne_1F_Corridor_MapScripts:: @ 81608CB .byte 0 SSAnne_1F_Corridor_EventScript_1608CC:: @ 81608CC - msgbox gUnknown_8172EE7, 2 + msgbox gUnknown_8172EE7, MSGBOX_NPC end SSAnne_1F_Corridor_EventScript_1608D5:: @ 81608D5 - msgbox gUnknown_8172F60, 2 + msgbox gUnknown_8172F60, MSGBOX_NPC end diff --git a/data/maps/SSAnne_1F_Room1/scripts.inc b/data/maps/SSAnne_1F_Room1/scripts.inc index ca75fd46d..5f610c830 100644 --- a/data/maps/SSAnne_1F_Room1/scripts.inc +++ b/data/maps/SSAnne_1F_Room1/scripts.inc @@ -2,5 +2,5 @@ SSAnne_1F_Room1_MapScripts:: @ 8160BDB .byte 0 SSAnne_1F_Room1_EventScript_160BDC:: @ 8160BDC - msgbox gUnknown_817393B, 2 + msgbox gUnknown_817393B, MSGBOX_NPC end diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc index 24414384f..3a80d3cfe 100644 --- a/data/maps/SSAnne_1F_Room2/scripts.inc +++ b/data/maps/SSAnne_1F_Room2/scripts.inc @@ -2,15 +2,15 @@ SSAnne_1F_Room2_MapScripts:: @ 8160BE5 .byte 0 SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6 - msgbox gUnknown_8173AC5, 2 + msgbox gUnknown_8173AC5, MSGBOX_NPC end SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF trainerbattle_single TRAINER_LASS_ANN, Text_173A1A, Text_173A4F - msgbox gUnknown_8173A7A, 6 + msgbox gUnknown_8173A7A, MSGBOX_AUTOCLOSE end SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06 trainerbattle_single TRAINER_YOUNGSTER_TYLER, Text_173999, Text_1739B1 - msgbox gUnknown_81739C5, 6 + msgbox gUnknown_81739C5, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_1F_Room3/scripts.inc b/data/maps/SSAnne_1F_Room3/scripts.inc index bdfe2cc07..7b9651040 100644 --- a/data/maps/SSAnne_1F_Room3/scripts.inc +++ b/data/maps/SSAnne_1F_Room3/scripts.inc @@ -2,11 +2,11 @@ SSAnne_1F_Room3_MapScripts:: @ 8160C1D .byte 0 SSAnne_1F_Room3_EventScript_160C1E:: @ 8160C1E - msgbox gUnknown_8173B21, 2 + msgbox gUnknown_8173B21, MSGBOX_NPC end SSAnne_1F_Room3_EventScript_160C27:: @ 8160C27 - msgbox gUnknown_8173AFA, 2 + msgbox gUnknown_8173AFA, MSGBOX_NPC end SSAnne_1F_Room3_EventScript_160C30:: @ 8160C30 diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc index 91407ef92..028442449 100644 --- a/data/maps/SSAnne_1F_Room5/scripts.inc +++ b/data/maps/SSAnne_1F_Room5/scripts.inc @@ -3,5 +3,5 @@ SSAnne_1F_Room5_MapScripts:: @ 8160C66 SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67 trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, Text_173BD1, Text_173BFA - msgbox gUnknown_8173C30, 6 + msgbox gUnknown_8173C30, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index 78a0f51e7..356e61152 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -5,7 +5,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 lock faceplayer msgbox gUnknown_817445B, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_160E18 closemessage call EventScript_FadeOut_Heal_FadeIn diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc index cde454332..5901ee65b 100644 --- a/data/maps/SSAnne_1F_Room7/scripts.inc +++ b/data/maps/SSAnne_1F_Room7/scripts.inc @@ -3,5 +3,5 @@ SSAnne_1F_Room7_MapScripts:: @ 8160C7E SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F trainerbattle_single TRAINER_GENTLEMAN_THOMAS, Text_173C52, Text_173CB4 - msgbox gUnknown_8173CC4, 6 + msgbox gUnknown_8173CC4, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 46a69aa10..02b06920a 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -180,5 +180,5 @@ Movement_160A4C:: @ 8160A4C step_end SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54 - msgbox gUnknown_8172FC3, 2 + msgbox gUnknown_8172FC3, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc index 90cf0a1fc..6568baa0e 100644 --- a/data/maps/SSAnne_2F_Room2/scripts.inc +++ b/data/maps/SSAnne_2F_Room2/scripts.inc @@ -3,10 +3,10 @@ SSAnne_2F_Room2_MapScripts:: @ 8160CB0 SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1 trainerbattle_single TRAINER_FISHERMAN_DALE, Text_173DDB, Text_173DF7 - msgbox gUnknown_8173E04, 6 + msgbox gUnknown_8173E04, MSGBOX_AUTOCLOSE end SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8 trainerbattle_single TRAINER_GENTLEMAN_BROOKS, Text_173D63, Text_173D92 - msgbox gUnknown_8173DB6, 6 + msgbox gUnknown_8173DB6, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_2F_Room3/scripts.inc b/data/maps/SSAnne_2F_Room3/scripts.inc index 577503151..33924805b 100644 --- a/data/maps/SSAnne_2F_Room3/scripts.inc +++ b/data/maps/SSAnne_2F_Room3/scripts.inc @@ -2,9 +2,9 @@ SSAnne_2F_Room3_MapScripts:: @ 8160CDF .byte 0 SSAnne_2F_Room3_EventScript_160CE0:: @ 8160CE0 - msgbox gUnknown_8173E3A, 2 + msgbox gUnknown_8173E3A, MSGBOX_NPC end SSAnne_2F_Room3_EventScript_160CE9:: @ 8160CE9 - msgbox gUnknown_8173E7B, 2 + msgbox gUnknown_8173E7B, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc index 46fd35501..85ecb21bf 100644 --- a/data/maps/SSAnne_2F_Room4/scripts.inc +++ b/data/maps/SSAnne_2F_Room4/scripts.inc @@ -3,10 +3,10 @@ SSAnne_2F_Room4_MapScripts:: @ 8160CF2 SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3 trainerbattle_single TRAINER_GENTLEMAN_LAMAR, Text_173F07, Text_173F42 - msgbox gUnknown_8173F55, 6 + msgbox gUnknown_8173F55, MSGBOX_AUTOCLOSE end SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A trainerbattle_single TRAINER_LASS_DAWN, Text_173F83, Text_173FAB - msgbox gUnknown_8173FB9, 6 + msgbox gUnknown_8173FB9, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_2F_Room5/scripts.inc b/data/maps/SSAnne_2F_Room5/scripts.inc index fb835d315..9635b4bf7 100644 --- a/data/maps/SSAnne_2F_Room5/scripts.inc +++ b/data/maps/SSAnne_2F_Room5/scripts.inc @@ -2,9 +2,9 @@ SSAnne_2F_Room5_MapScripts:: @ 8160D21 .byte 0 SSAnne_2F_Room5_EventScript_160D22:: @ 8160D22 - msgbox gUnknown_8173FF7, 2 + msgbox gUnknown_8173FF7, MSGBOX_NPC end SSAnne_2F_Room5_EventScript_160D2B:: @ 8160D2B - msgbox gUnknown_817404F, 2 + msgbox gUnknown_817404F, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room6/scripts.inc b/data/maps/SSAnne_2F_Room6/scripts.inc index 2fb6544da..e92a5501e 100644 --- a/data/maps/SSAnne_2F_Room6/scripts.inc +++ b/data/maps/SSAnne_2F_Room6/scripts.inc @@ -2,9 +2,9 @@ SSAnne_2F_Room6_MapScripts:: @ 8160D34 .byte 0 SSAnne_2F_Room6_EventScript_160D35:: @ 8160D35 - msgbox gUnknown_81740A1, 2 + msgbox gUnknown_81740A1, MSGBOX_NPC end SSAnne_2F_Room6_EventScript_160D3E:: @ 8160D3E - msgbox gUnknown_81740D6, 2 + msgbox gUnknown_81740D6, MSGBOX_NPC end diff --git a/data/maps/SSAnne_3F_Corridor/scripts.inc b/data/maps/SSAnne_3F_Corridor/scripts.inc index b4f61fe75..5e67f5532 100644 --- a/data/maps/SSAnne_3F_Corridor/scripts.inc +++ b/data/maps/SSAnne_3F_Corridor/scripts.inc @@ -2,5 +2,5 @@ SSAnne_3F_Corridor_MapScripts:: @ 8160A5D .byte 0 SSAnne_3F_Corridor_EventScript_160A5E:: @ 8160A5E - msgbox gUnknown_817320C, 2 + msgbox gUnknown_817320C, MSGBOX_NPC end diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc index 68d7ae9d0..44cb7d2d1 100644 --- a/data/maps/SSAnne_B1F_Room1/scripts.inc +++ b/data/maps/SSAnne_B1F_Room1/scripts.inc @@ -3,10 +3,10 @@ SSAnne_B1F_Room1_MapScripts:: @ 8160D47 SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48 trainerbattle_single TRAINER_FISHERMAN_BARNY, Text_174177, Text_1741EF - msgbox gUnknown_817420E, 6 + msgbox gUnknown_817420E, MSGBOX_AUTOCLOSE end SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F trainerbattle_single TRAINER_SAILOR_PHILLIP, Text_1740F6, Text_174123 - msgbox gUnknown_817413A, 6 + msgbox gUnknown_817413A, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc index 9f28f7cf5..db9f37fe3 100644 --- a/data/maps/SSAnne_B1F_Room2/scripts.inc +++ b/data/maps/SSAnne_B1F_Room2/scripts.inc @@ -3,5 +3,5 @@ SSAnne_B1F_Room2_MapScripts:: @ 8160D76 SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77 trainerbattle_single TRAINER_SAILOR_HUEY, Text_174239, Text_17425C - msgbox gUnknown_8174272, 6 + msgbox gUnknown_8174272, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc index af2277e2c..df90031ac 100644 --- a/data/maps/SSAnne_B1F_Room3/scripts.inc +++ b/data/maps/SSAnne_B1F_Room3/scripts.inc @@ -3,5 +3,5 @@ SSAnne_B1F_Room3_MapScripts:: @ 8160D8E SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F trainerbattle_single TRAINER_SAILOR_DYLAN, Text_1742A6, Text_1742C3 - msgbox gUnknown_81742D2, 6 + msgbox gUnknown_81742D2, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc index 1c5766a91..c84b55b07 100644 --- a/data/maps/SSAnne_B1F_Room4/scripts.inc +++ b/data/maps/SSAnne_B1F_Room4/scripts.inc @@ -3,10 +3,10 @@ SSAnne_B1F_Room4_MapScripts:: @ 8160DA6 SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7 trainerbattle_single TRAINER_SAILOR_LEONARD, Text_174315, Text_174348 - msgbox gUnknown_8174362, 6 + msgbox gUnknown_8174362, MSGBOX_AUTOCLOSE end SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE trainerbattle_single TRAINER_SAILOR_DUNCAN, Text_174385, Text_1743B3 - msgbox gUnknown_81743C8, 6 + msgbox gUnknown_81743C8, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room5/scripts.inc b/data/maps/SSAnne_B1F_Room5/scripts.inc index c449d1164..37d26661b 100644 --- a/data/maps/SSAnne_B1F_Room5/scripts.inc +++ b/data/maps/SSAnne_B1F_Room5/scripts.inc @@ -2,7 +2,7 @@ SSAnne_B1F_Room5_MapScripts:: @ 8160DD5 .byte 0 SSAnne_B1F_Room5_EventScript_160DD6:: @ 8160DD6 - msgbox gUnknown_81743F8, 2 + msgbox gUnknown_81743F8, MSGBOX_NPC end SSAnne_B1F_Room5_EventScript_160DDF:: @ 8160DDF diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 54481438f..7171cae6d 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -38,9 +38,9 @@ EventScript_160BB5:: @ 8160BB5 end SSAnne_CaptainsOffice_EventScript_160BC9:: @ 8160BC9 - msgbox gUnknown_81738E6, 3 + msgbox gUnknown_81738E6, MSGBOX_SIGN end SSAnne_CaptainsOffice_EventScript_160BD2:: @ 8160BD2 - msgbox gUnknown_8173903, 3 + msgbox gUnknown_8173903, MSGBOX_SIGN end diff --git a/data/maps/SSAnne_Deck/scripts.inc b/data/maps/SSAnne_Deck/scripts.inc index 1d93ae66a..d61b65d87 100644 --- a/data/maps/SSAnne_Deck/scripts.inc +++ b/data/maps/SSAnne_Deck/scripts.inc @@ -2,23 +2,23 @@ SSAnne_Deck_MapScripts:: @ 8160A68 .byte 0 SSAnne_Deck_EventScript_160A69:: @ 8160A69 - msgbox gUnknown_817326F, 2 + msgbox gUnknown_817326F, MSGBOX_NPC end SSAnne_Deck_EventScript_160A72:: @ 8160A72 - msgbox gUnknown_81732C6, 2 + msgbox gUnknown_81732C6, MSGBOX_NPC end SSAnne_Deck_EventScript_160A7B:: @ 8160A7B - msgbox gUnknown_81732A2, 2 + msgbox gUnknown_81732A2, MSGBOX_NPC end SSAnne_Deck_EventScript_160A84:: @ 8160A84 trainerbattle_single TRAINER_SAILOR_EDMOND, Text_173308, Text_17332B - msgbox gUnknown_817333E, 6 + msgbox gUnknown_817333E, MSGBOX_AUTOCLOSE end SSAnne_Deck_EventScript_160A9B:: @ 8160A9B trainerbattle_single TRAINER_SAILOR_TREVOR, Text_173382, Text_1733A0 - msgbox gUnknown_81733B5, 6 + msgbox gUnknown_81733B5, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index b5619e78e..565efd607 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -2,15 +2,15 @@ SSAnne_Kitchen_MapScripts:: @ 8160AB2 .byte 0 SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3 - msgbox gUnknown_81733F8, 2 + msgbox gUnknown_81733F8, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC - msgbox gUnknown_8173429, 2 + msgbox gUnknown_8173429, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5 - msgbox gUnknown_8173462, 2 + msgbox gUnknown_8173462, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE @@ -41,13 +41,13 @@ EventScript_160B15:: @ 8160B15 return SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E - msgbox gUnknown_81734A0, 2 + msgbox gUnknown_81734A0, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160B27:: @ 8160B27 - msgbox gUnknown_81734D3, 2 + msgbox gUnknown_81734D3, MSGBOX_NPC end SSAnne_Kitchen_EventScript_160B30:: @ 8160B30 - msgbox gUnknown_817353E, 2 + msgbox gUnknown_817353E, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Building1/scripts.inc b/data/maps/SafariZone_Building1/scripts.inc index 668e92250..6aaeac452 100644 --- a/data/maps/SafariZone_Building1/scripts.inc +++ b/data/maps/SafariZone_Building1/scripts.inc @@ -2,9 +2,9 @@ SafariZone_Building1_MapScripts:: @ 81623EB .byte 0 SafariZone_Building1_EventScript_1623EC:: @ 81623EC - msgbox gUnknown_8177A5A, 2 + msgbox gUnknown_8177A5A, MSGBOX_NPC end SafariZone_Building1_EventScript_1623F5:: @ 81623F5 - msgbox gUnknown_8177A82, 2 + msgbox gUnknown_8177A82, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Building2/scripts.inc b/data/maps/SafariZone_Building2/scripts.inc index 717ccf36b..ff870464a 100644 --- a/data/maps/SafariZone_Building2/scripts.inc +++ b/data/maps/SafariZone_Building2/scripts.inc @@ -2,13 +2,13 @@ SafariZone_Building2_MapScripts:: @ 81623FE .byte 0 SafariZone_Building2_EventScript_1623FF:: @ 81623FF - msgbox gUnknown_8177AE2, 2 + msgbox gUnknown_8177AE2, MSGBOX_NPC end SafariZone_Building2_EventScript_162408:: @ 8162408 - msgbox gUnknown_8177AAE, 2 + msgbox gUnknown_8177AAE, MSGBOX_NPC end SafariZone_Building2_EventScript_162411:: @ 8162411 - msgbox gUnknown_8177B16, 2 + msgbox gUnknown_8177B16, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Building3/scripts.inc b/data/maps/SafariZone_Building3/scripts.inc index a4dc55062..4b328da88 100644 --- a/data/maps/SafariZone_Building3/scripts.inc +++ b/data/maps/SafariZone_Building3/scripts.inc @@ -2,13 +2,13 @@ SafariZone_Building3_MapScripts:: @ 816241A .byte 0 SafariZone_Building3_EventScript_16241B:: @ 816241B - msgbox gUnknown_8177BAB, 2 + msgbox gUnknown_8177BAB, MSGBOX_NPC end SafariZone_Building3_EventScript_162424:: @ 8162424 - msgbox gUnknown_8177B38, 2 + msgbox gUnknown_8177B38, MSGBOX_NPC end SafariZone_Building3_EventScript_16242D:: @ 816242D - msgbox gUnknown_8177BEC, 2 + msgbox gUnknown_8177BEC, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Building4/scripts.inc b/data/maps/SafariZone_Building4/scripts.inc index 8f589cd8f..1c3e52bd3 100644 --- a/data/maps/SafariZone_Building4/scripts.inc +++ b/data/maps/SafariZone_Building4/scripts.inc @@ -2,13 +2,13 @@ SafariZone_Building4_MapScripts:: @ 8162436 .byte 0 SafariZone_Building4_EventScript_162437:: @ 8162437 - msgbox gUnknown_8177D39, 2 + msgbox gUnknown_8177D39, MSGBOX_NPC end SafariZone_Building4_EventScript_162440:: @ 8162440 - msgbox gUnknown_8177CEB, 2 + msgbox gUnknown_8177CEB, MSGBOX_NPC end SafariZone_Building4_EventScript_162449:: @ 8162449 - msgbox gUnknown_8177D8B, 2 + msgbox gUnknown_8177D8B, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Center/scripts.inc b/data/maps/SafariZone_Center/scripts.inc index 28e8fb3e6..70599b024 100644 --- a/data/maps/SafariZone_Center/scripts.inc +++ b/data/maps/SafariZone_Center/scripts.inc @@ -7,13 +7,13 @@ SafariZone_Center_OnTransition:: @ 816235D end SafariZone_Center_EventScript_162361:: @ 8162361 - msgbox gUnknown_81777F2, 3 + msgbox gUnknown_81777F2, MSGBOX_SIGN end SafariZone_Center_EventScript_16236A:: @ 816236A - msgbox gUnknown_81777FD, 3 + msgbox gUnknown_81777FD, MSGBOX_SIGN end SafariZone_Center_EventScript_162373:: @ 8162373 - msgbox gUnknown_817782F, 3 + msgbox gUnknown_817782F, MSGBOX_SIGN end diff --git a/data/maps/SafariZone_East/scripts.inc b/data/maps/SafariZone_East/scripts.inc index b38039b36..e37be0d00 100644 --- a/data/maps/SafariZone_East/scripts.inc +++ b/data/maps/SafariZone_East/scripts.inc @@ -2,13 +2,13 @@ SafariZone_East_MapScripts:: @ 816237C .byte 0 SafariZone_East_EventScript_16237D:: @ 816237D - msgbox gUnknown_817783B, 3 + msgbox gUnknown_817783B, MSGBOX_SIGN end SafariZone_East_EventScript_162386:: @ 8162386 - msgbox gUnknown_8177846, 3 + msgbox gUnknown_8177846, MSGBOX_SIGN end SafariZone_East_EventScript_16238F:: @ 816238F - msgbox gUnknown_8177884, 3 + msgbox gUnknown_8177884, MSGBOX_SIGN end diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc index f45988629..65a8ad4dd 100644 --- a/data/maps/SafariZone_North/scripts.inc +++ b/data/maps/SafariZone_North/scripts.inc @@ -2,21 +2,21 @@ SafariZone_North_MapScripts:: @ 8162398 .byte 0 SafariZone_North_EventScript_162399:: @ 8162399 - msgbox gUnknown_817789D, 3 + msgbox gUnknown_817789D, MSGBOX_SIGN end SafariZone_North_EventScript_1623A2:: @ 81623A2 - msgbox gUnknown_81778A8, 3 + msgbox gUnknown_81778A8, MSGBOX_SIGN end SafariZone_North_EventScript_1623AB:: @ 81623AB - msgbox gUnknown_81778D6, 3 + msgbox gUnknown_81778D6, MSGBOX_SIGN end SafariZone_North_EventScript_1623B4:: @ 81623B4 - msgbox gUnknown_81778DD, 3 + msgbox gUnknown_81778DD, MSGBOX_SIGN end SafariZone_North_EventScript_1623BD:: @ 81623BD - msgbox gUnknown_8177935, 3 + msgbox gUnknown_8177935, MSGBOX_SIGN end diff --git a/data/maps/SafariZone_West/scripts.inc b/data/maps/SafariZone_West/scripts.inc index 2b8357334..3d6e0bbf7 100644 --- a/data/maps/SafariZone_West/scripts.inc +++ b/data/maps/SafariZone_West/scripts.inc @@ -2,17 +2,17 @@ SafariZone_West_MapScripts:: @ 81623C6 .byte 0 SafariZone_West_EventScript_1623C7:: @ 81623C7 - msgbox gUnknown_817796E, 3 + msgbox gUnknown_817796E, MSGBOX_SIGN end SafariZone_West_EventScript_1623D0:: @ 81623D0 - msgbox gUnknown_8177979, 3 + msgbox gUnknown_8177979, MSGBOX_SIGN end SafariZone_West_EventScript_1623D9:: @ 81623D9 - msgbox gUnknown_81779F8, 3 + msgbox gUnknown_81779F8, MSGBOX_SIGN end SafariZone_West_EventScript_1623E2:: @ 81623E2 - msgbox gUnknown_8177A41, 3 + msgbox gUnknown_8177A41, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 3973d5e6b..53d697ff0 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -12,31 +12,31 @@ EventScript_167372:: @ 8167372 return SaffronCity_EventScript_16737A:: @ 816737A - msgbox gUnknown_8181003, 2 + msgbox gUnknown_8181003, MSGBOX_NPC end SaffronCity_EventScript_167383:: @ 8167383 - msgbox gUnknown_818101F, 2 + msgbox gUnknown_818101F, MSGBOX_NPC end SaffronCity_EventScript_16738C:: @ 816738C - msgbox gUnknown_818105A, 2 + msgbox gUnknown_818105A, MSGBOX_NPC end SaffronCity_EventScript_167395:: @ 8167395 - msgbox gUnknown_8181087, 2 + msgbox gUnknown_8181087, MSGBOX_NPC end SaffronCity_EventScript_16739E:: @ 816739E - msgbox gUnknown_81810A7, 2 + msgbox gUnknown_81810A7, MSGBOX_NPC end SaffronCity_EventScript_1673A7:: @ 81673A7 - msgbox gUnknown_81810D5, 2 + msgbox gUnknown_81810D5, MSGBOX_NPC end SaffronCity_EventScript_1673B0:: @ 81673B0 - msgbox gUnknown_81810F5, 2 + msgbox gUnknown_81810F5, MSGBOX_NPC end SaffronCity_EventScript_1673B9:: @ 81673B9 @@ -55,19 +55,19 @@ EventScript_1673D7:: @ 81673D7 end SaffronCity_EventScript_1673E3:: @ 81673E3 - msgbox gUnknown_8181159, 2 + msgbox gUnknown_8181159, MSGBOX_NPC end SaffronCity_EventScript_1673EC:: @ 81673EC - msgbox gUnknown_8181189, 2 + msgbox gUnknown_8181189, MSGBOX_NPC end SaffronCity_EventScript_1673F5:: @ 81673F5 - msgbox gUnknown_81811BF, 2 + msgbox gUnknown_81811BF, MSGBOX_NPC end SaffronCity_EventScript_1673FE:: @ 81673FE - msgbox gUnknown_8181225, 2 + msgbox gUnknown_8181225, MSGBOX_NPC end SaffronCity_EventScript_167407:: @ 8167407 @@ -81,15 +81,15 @@ SaffronCity_EventScript_167407:: @ 8167407 end SaffronCity_EventScript_16741A:: @ 816741A - msgbox gUnknown_8181299, 2 + msgbox gUnknown_8181299, MSGBOX_NPC end SaffronCity_EventScript_167423:: @ 8167423 - msgbox gUnknown_8181326, 3 + msgbox gUnknown_8181326, MSGBOX_SIGN end SaffronCity_EventScript_16742C:: @ 816742C - msgbox gUnknown_8181354, 3 + msgbox gUnknown_8181354, MSGBOX_SIGN end SaffronCity_EventScript_167435:: @ 8167435 @@ -100,25 +100,25 @@ SaffronCity_EventScript_167435:: @ 8167435 end SaffronCity_EventScript_16744D:: @ 816744D - msgbox gUnknown_81813AA, 3 + msgbox gUnknown_81813AA, MSGBOX_SIGN end SaffronCity_EventScript_167456:: @ 8167456 - msgbox gUnknown_8181452, 3 + msgbox gUnknown_8181452, MSGBOX_SIGN end SaffronCity_EventScript_16745F:: @ 816745F - msgbox gUnknown_81814B9, 3 + msgbox gUnknown_81814B9, MSGBOX_SIGN end SaffronCity_EventScript_167468:: @ 8167468 - msgbox gUnknown_81814D3, 3 + msgbox gUnknown_81814D3, MSGBOX_SIGN end SaffronCity_EventScript_167471:: @ 8167471 - msgbox gUnknown_81814E7, 3 + msgbox gUnknown_81814E7, MSGBOX_SIGN end SaffronCity_EventScript_16747A:: @ 816747A - msgbox gUnknown_8181519, 3 + msgbox gUnknown_8181519, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index c03e62262..2994fabdd 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -28,7 +28,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 textcolor 0 msgbox gUnknown_819B44E, MSGBOX_YESNO call EventScript_1A6675 - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16EC82 erasemonpic release @@ -50,7 +50,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 textcolor 0 msgbox gUnknown_819B49E, MSGBOX_YESNO call EventScript_1A6675 - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16EC82 erasemonpic release @@ -77,7 +77,7 @@ EventScript_16ECB5:: @ 816ECB5 waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16ED29 call EventScript_1A8C27 call EventScript_1A74EB @@ -93,7 +93,7 @@ EventScript_16ECEC:: @ 816ECEC waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16ED1E call EventScript_1A8C33 goto EventScript_16ED1E @@ -109,41 +109,41 @@ EventScript_16ED29:: @ 816ED29 end SaffronCity_Dojo_EventScript_16ED2B:: @ 816ED2B - msgbox gUnknown_819B52E, 3 + msgbox gUnknown_819B52E, MSGBOX_SIGN end SaffronCity_Dojo_EventScript_16ED34:: @ 816ED34 - msgbox gUnknown_819B4F8, 3 + msgbox gUnknown_819B4F8, MSGBOX_SIGN end SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D - msgbox gUnknown_819B50F, 3 + msgbox gUnknown_819B50F, MSGBOX_SIGN end SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, Text_19B3DF, Text_19B40F - msgbox gUnknown_819B41F, 6 + msgbox gUnknown_819B41F, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, Text_19B2E0, Text_19B2FD - msgbox gUnknown_819B30F, 6 + msgbox gUnknown_819B30F, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 trainerbattle_single TRAINER_BLACK_BELT_AARON, Text_19B341, Text_19B396 - msgbox gUnknown_819B3AC, 6 + msgbox gUnknown_819B3AC, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B trainerbattle_single TRAINER_BLACK_BELT_MIKE, Text_19B275, Text_19B292 - msgbox gUnknown_819B29D, 6 + msgbox gUnknown_819B29D, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 trainerbattle_single TRAINER_BLACK_BELT_KOICHI, Text_19B12C, Text_19B193, EventScript_16EDD0 goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EDC6 - msgbox gUnknown_819B1A7, 6 + msgbox gUnknown_819B1A7, MSGBOX_AUTOCLOSE end EventScript_16EDC6:: @ 816EDC6 diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index b51cb49b6..43ad8a354 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -37,38 +37,38 @@ EventScript_16EE7E:: @ 816EE7E SaffronCity_Gym_EventScript_16EE88:: @ 816EE88 trainerbattle_single TRAINER_PSYCHIC_JOHAN, Text_19B936, Text_19B957 - msgbox gUnknown_819B96D, 6 + msgbox gUnknown_819B96D, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F trainerbattle_single TRAINER_PSYCHIC_TYRON, Text_19BA45, Text_19BA9E famechecker FAMECHECKER_SABRINA, 5 - msgbox gUnknown_819BAB4, 6 + msgbox gUnknown_819BAB4, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3 trainerbattle_single TRAINER_PSYCHIC_CAMERON, Text_19BB49, Text_19BBA1 - msgbox gUnknown_819BBB3, 6 + msgbox gUnknown_819BBB3, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA trainerbattle_single TRAINER_PSYCHIC_PRESTON, Text_19BC57, Text_19BCBC - msgbox gUnknown_819BCC4, 6 + msgbox gUnknown_819BCC4, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1 trainerbattle_single TRAINER_CHANNELER_AMANDA, Text_19B86A, Text_19B8A8 - msgbox gUnknown_819B8B9, 6 + msgbox gUnknown_819B8B9, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EF08:: @ 816EF08 trainerbattle_single TRAINER_CHANNELER_STACY, Text_19B998, Text_19B9EC - msgbox gUnknown_819B9F7, 6 + msgbox gUnknown_819B9F7, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F trainerbattle_single TRAINER_CHANNELER_TASHA, Text_19BAE8, Text_19BB0D - msgbox gUnknown_819BB1F, 6 + msgbox gUnknown_819BB1F, MSGBOX_AUTOCLOSE end SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 diff --git a/data/maps/SaffronCity_House1_1F/scripts.inc b/data/maps/SaffronCity_House1_1F/scripts.inc index eb0bcd429..2f4e435fa 100644 --- a/data/maps/SaffronCity_House1_1F/scripts.inc +++ b/data/maps/SaffronCity_House1_1F/scripts.inc @@ -2,11 +2,11 @@ SaffronCity_House1_1F_MapScripts:: @ 816EB36 .byte 0 SaffronCity_House1_1F_EventScript_16EB37:: @ 816EB37 - msgbox gUnknown_819AB9B, 2 + msgbox gUnknown_819AB9B, MSGBOX_NPC end SaffronCity_House1_1F_EventScript_16EB40:: @ 816EB40 - msgbox gUnknown_819ABD7, 2 + msgbox gUnknown_819ABD7, MSGBOX_NPC end SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49 diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index e29fbea9d..478bddb84 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -44,9 +44,9 @@ EventScript_16EBC0:: @ 816EBC0 return SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9 - msgbox gUnknown_819B0D0, 3 + msgbox gUnknown_819B0D0, MSGBOX_SIGN end SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2 - msgbox gUnknown_819B0A0, 3 + msgbox gUnknown_819B0A0, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity_House2/scripts.inc b/data/maps/SaffronCity_House2/scripts.inc index 9cc63072c..03afb1a4c 100644 --- a/data/maps/SaffronCity_House2/scripts.inc +++ b/data/maps/SaffronCity_House2/scripts.inc @@ -2,11 +2,11 @@ SaffronCity_House2_MapScripts:: @ 816EF73 .byte 0 SaffronCity_House2_EventScript_16EF74:: @ 816EF74 - msgbox gUnknown_819BE74, 2 + msgbox gUnknown_819BE74, MSGBOX_NPC end SaffronCity_House2_EventScript_16EF7D:: @ 816EF7D - msgbox gUnknown_819BED5, 2 + msgbox gUnknown_819BED5, MSGBOX_NPC end SaffronCity_House2_EventScript_16EF86:: @ 816EF86 @@ -20,5 +20,5 @@ SaffronCity_House2_EventScript_16EF86:: @ 816EF86 end SaffronCity_House2_EventScript_16EF99:: @ 816EF99 - msgbox gUnknown_819BF07, 3 + msgbox gUnknown_819BF07, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index 3779bb5e2..815ee773b 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -2,11 +2,11 @@ SaffronCity_Mart_MapScripts:: @ 816EFA2 .byte 0 SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3 - msgbox gUnknown_819BFF1, 2 + msgbox gUnknown_819BFF1, MSGBOX_NPC end SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC - msgbox gUnknown_819BF8F, 2 + msgbox gUnknown_819BF8F, MSGBOX_NPC end SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 6b7099b5d..fe28e6c75 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -15,11 +15,11 @@ SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB end SaffronCity_PokemonCenter_1F_EventScript_16F004:: @ 816F004 - msgbox gUnknown_819C058, 2 + msgbox gUnknown_819C058, MSGBOX_NPC end SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D - msgbox gUnknown_819C023, 2 + msgbox gUnknown_819C023, MSGBOX_NPC end SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 58596c2e6..ed878b0a5 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -198,9 +198,9 @@ EventScript_163222:: @ 8163222 end SeafoamIslands_B4F_EventScript_163223:: @ 8163223 - msgbox gUnknown_8179B36, 3 + msgbox gUnknown_8179B36, MSGBOX_SIGN end SeafoamIslands_B4F_EventScript_16322C:: @ 816322C - msgbox gUnknown_8179B65, 3 + msgbox gUnknown_8179B65, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland/scripts.inc b/data/maps/SevenIsland/scripts.inc index 2f9606459..f7debbf02 100644 --- a/data/maps/SevenIsland/scripts.inc +++ b/data/maps/SevenIsland/scripts.inc @@ -7,13 +7,13 @@ SevenIsland_OnTransition:: @ 8167EB9 end SevenIsland_EventScript_167EBD:: @ 8167EBD - msgbox gUnknown_8183046, 3 + msgbox gUnknown_8183046, MSGBOX_SIGN end SevenIsland_EventScript_167EC6:: @ 8167EC6 - msgbox gUnknown_818306C, 2 + msgbox gUnknown_818306C, MSGBOX_NPC end SevenIsland_EventScript_167ECF:: @ 8167ECF - msgbox gUnknown_8183143, 2 + msgbox gUnknown_8183143, MSGBOX_NPC end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 8a44e194c..0818db154 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -92,13 +92,13 @@ EventScript_170987:: @ 8170987 special SavePlayerParty special Special_BufferEReaderTrainerName5 msgbox gUnknown_81A0598, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_170A11 call EventScript_170A1E compare VAR_RESULT, 0 goto_if_eq EventScript_170A11 msgbox gUnknown_81A0788, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_170A11 special LoadPlayerParty call EventScript_1A4EAF @@ -179,5 +179,5 @@ Movement_170A72:: @ 8170A72 step_end SevenIsland_House_Room1_EventScript_170A75:: @ 8170A75 - msgbox gUnknown_81A0567, 3 + msgbox gUnknown_81A0567, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index b5b10b288..d2a42ac38 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -30,13 +30,13 @@ Items_170B58:: @ 8170B58 end SevenIsland_Mart_EventScript_170B6E:: @ 8170B6E - msgbox gUnknown_81A0A4F, 2 + msgbox gUnknown_81A0A4F, MSGBOX_NPC end SevenIsland_Mart_EventScript_170B77:: @ 8170B77 - msgbox gUnknown_81A0ACC, 2 + msgbox gUnknown_81A0ACC, MSGBOX_NPC end SevenIsland_Mart_EventScript_170B80:: @ 8170B80 - msgbox gUnknown_81A0B09, 2 + msgbox gUnknown_81A0B09, MSGBOX_NPC end diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 53155e776..3992ac871 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98 end SevenIsland_PokemonCenter_1F_EventScript_170BA1:: @ 8170BA1 - msgbox gUnknown_81A0B98, 2 + msgbox gUnknown_81A0B98, MSGBOX_NPC end SevenIsland_PokemonCenter_1F_EventScript_170BAA:: @ 8170BAA - msgbox gUnknown_81A0C1F, 2 + msgbox gUnknown_81A0C1F, MSGBOX_NPC end SevenIsland_PokemonCenter_1F_EventScript_170BB3:: @ 8170BB3 - msgbox gUnknown_81A0CA5, 2 + msgbox gUnknown_81A0CA5, MSGBOX_NPC end diff --git a/data/maps/SevenIsland_SevaultCanyon/scripts.inc b/data/maps/SevenIsland_SevaultCanyon/scripts.inc index f0122ffbf..8c906d3f2 100644 --- a/data/maps/SevenIsland_SevaultCanyon/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon/scripts.inc @@ -2,5 +2,5 @@ SevenIsland_SevaultCanyon_MapScripts:: @ 8168BFD .byte 0 SevenIsland_SevaultCanyon_EventScript_168BFE:: @ 8168BFE - msgbox gUnknown_818CF2B, 3 + msgbox gUnknown_818CF2B, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc index 7fcda3492..617055d66 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc @@ -2,5 +2,5 @@ SevenIsland_SevaultCanyon_Entrance_MapScripts:: @ 8168BF3 .byte 0 SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4:: @ 8168BF4 - msgbox gUnknown_818C82D, 3 + msgbox gUnknown_818C82D, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index c5471b1ea..3e495c6cd 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -14,7 +14,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 msgbox gUnknown_81A4D72 textcolor 3 msgbox gUnknown_81A4DAF, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_172225 msgbox gUnknown_81A4DD8 closemessage diff --git a/data/maps/SevenIsland_TrainerTower/scripts.inc b/data/maps/SevenIsland_TrainerTower/scripts.inc index 9e3139dd3..56716493a 100644 --- a/data/maps/SevenIsland_TrainerTower/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower/scripts.inc @@ -7,9 +7,9 @@ SevenIsland_TrainerTower_OnTransition:: @ 8168BDB end SevenIsland_TrainerTower_EventScript_168BE1:: @ 8168BE1 - msgbox gUnknown_818C338, 3 + msgbox gUnknown_818C338, MSGBOX_SIGN end SevenIsland_TrainerTower_EventScript_168BEA:: @ 8168BEA - msgbox gUnknown_818C370, 3 + msgbox gUnknown_818C370, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 979ae6446..04ce5880d 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -229,9 +229,9 @@ SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8 end SevenIsland_TrainerTower_Lobby_EventScript_164AE6:: @ 8164AE6 - msgbox gUnknown_817CE38, 2 + msgbox gUnknown_817CE38, MSGBOX_NPC end SevenIsland_TrainerTower_Lobby_EventScript_164AEF:: @ 8164AEF - msgbox gUnknown_817CE9F, 2 + msgbox gUnknown_817CE9F, MSGBOX_NPC end diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index ef6bc4382..a0ab7219b 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -21,15 +21,15 @@ EventScript_161DAD:: @ 8161DAD end SilphCo_10F_EventScript_161DB7:: @ 8161DB7 - msgbox gUnknown_8176DF8, 3 + msgbox gUnknown_8176DF8, MSGBOX_SIGN end SilphCo_10F_EventScript_161DC0:: @ 8161DC0 trainerbattle_single TRAINER_SCIENTIST_TRAVIS, Text_176D57, Text_176D73 - msgbox gUnknown_8176D86, 6 + msgbox gUnknown_8176D86, MSGBOX_AUTOCLOSE end SilphCo_10F_EventScript_161DD7:: @ 8161DD7 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, Text_176CED, Text_176D18 - msgbox gUnknown_8176D25, 6 + msgbox gUnknown_8176D25, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index c824a3f0b..65d67dc2d 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -43,7 +43,7 @@ EventScript_161E75:: @ 8161E75 end SilphCo_11F_EventScript_161E7F:: @ 8161E7F - msgbox gUnknown_81770A9, 2 + msgbox gUnknown_81770A9, MSGBOX_NPC end SilphCo_11F_EventScript_161E88:: @ 8161E88 @@ -123,19 +123,19 @@ Movement_161F27:: @ 8161F27 step_end EventScript_161F2E:: @ 8161F2E - msgbox gUnknown_817732B, 3 + msgbox gUnknown_817732B, MSGBOX_SIGN end SilphCo_11F_EventScript_161F37:: @ 8161F37 - msgbox gUnknown_817734A, 3 + msgbox gUnknown_817734A, MSGBOX_SIGN end SilphCo_11F_EventScript_161F40:: @ 8161F40 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, Text_1772B8, Text_1772E7 - msgbox gUnknown_81772F9, 6 + msgbox gUnknown_81772F9, MSGBOX_AUTOCLOSE end SilphCo_11F_EventScript_161F57:: @ 8161F57 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, Text_17726A, Text_17728C - msgbox gUnknown_817729B, 6 + msgbox gUnknown_817729B, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc index a6ef4a1c3..f10c4d8b3 100644 --- a/data/maps/SilphCo_1F/scripts.inc +++ b/data/maps/SilphCo_1F/scripts.inc @@ -7,9 +7,9 @@ SilphCo_1F_OnTransition:: @ 816162B end SilphCo_1F_EventScript_16162F:: @ 816162F - msgbox gUnknown_81754F7, 2 + msgbox gUnknown_81754F7, MSGBOX_NPC end SilphCo_1F_EventScript_161638:: @ 8161638 - msgbox gUnknown_8175549, 3 + msgbox gUnknown_8175549, MSGBOX_SIGN end diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 53e9c8129..6488ce3e5 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -14,25 +14,25 @@ EventScript_16165F:: @ 816165F end SilphCo_2F_EventScript_161660:: @ 8161660 - msgbox gUnknown_8175894, 3 + msgbox gUnknown_8175894, MSGBOX_SIGN end SilphCo_2F_EventScript_161669:: @ 8161669 trainerbattle_single TRAINER_SCIENTIST_CONNOR, Text_175562, Text_17557E - msgbox gUnknown_817559F, 6 + msgbox gUnknown_817559F, MSGBOX_AUTOCLOSE end SilphCo_2F_EventScript_161680:: @ 8161680 trainerbattle_single TRAINER_SCIENTIST_JERRY, Text_1755C6, Text_1755E5 - msgbox gUnknown_81755F2, 6 + msgbox gUnknown_81755F2, MSGBOX_AUTOCLOSE end SilphCo_2F_EventScript_161697:: @ 8161697 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, Text_17562D, Text_17564A - msgbox gUnknown_8175651, 6 + msgbox gUnknown_8175651, MSGBOX_AUTOCLOSE end SilphCo_2F_EventScript_1616AE:: @ 81616AE trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, Text_1756AD, Text_1756D8 - msgbox gUnknown_81756E2, 6 + msgbox gUnknown_81756E2, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index 2b321225a..a5e62b667 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -22,15 +22,15 @@ EventScript_1616F5:: @ 81616F5 end SilphCo_3F_EventScript_1616FF:: @ 81616FF - msgbox gUnknown_81759DC, 3 + msgbox gUnknown_81759DC, MSGBOX_SIGN end SilphCo_3F_EventScript_161708:: @ 8161708 trainerbattle_single TRAINER_SCIENTIST_JOSE, Text_175948, Text_17597D - msgbox gUnknown_8175990, 6 + msgbox gUnknown_8175990, MSGBOX_AUTOCLOSE end SilphCo_3F_EventScript_16171F:: @ 816171F trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, Text_1758F6, Text_175911 - msgbox gUnknown_817591C, 6 + msgbox gUnknown_817591C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index 595f42ab6..406e394f1 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -22,20 +22,20 @@ EventScript_161766:: @ 8161766 end SilphCo_4F_EventScript_161770:: @ 8161770 - msgbox gUnknown_8175B57, 3 + msgbox gUnknown_8175B57, MSGBOX_SIGN end SilphCo_4F_EventScript_161779:: @ 8161779 trainerbattle_single TRAINER_SCIENTIST_RODNEY, Text_175A90, Text_175AB0 - msgbox gUnknown_8175AC8, 6 + msgbox gUnknown_8175AC8, MSGBOX_AUTOCLOSE end SilphCo_4F_EventScript_161790:: @ 8161790 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, Text_175A2F, Text_175A5B - msgbox gUnknown_8175A62, 6 + msgbox gUnknown_8175A62, MSGBOX_AUTOCLOSE end SilphCo_4F_EventScript_1617A7:: @ 81617A7 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, Text_175B19, Text_175B2B - msgbox gUnknown_8175B38, 6 + msgbox gUnknown_8175B38, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index e702b2876..1a17e3b44 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -23,37 +23,37 @@ EventScript_1617F7:: @ 81617F7 end SilphCo_5F_EventScript_161801:: @ 8161801 - msgbox gUnknown_8175D89, 3 + msgbox gUnknown_8175D89, MSGBOX_SIGN end SilphCo_5F_EventScript_16180A:: @ 816180A - msgbox gUnknown_8175DE0, 3 + msgbox gUnknown_8175DE0, MSGBOX_SIGN end SilphCo_5F_EventScript_161813:: @ 8161813 - msgbox gUnknown_8175E28, 3 + msgbox gUnknown_8175E28, MSGBOX_SIGN end SilphCo_5F_EventScript_16181C:: @ 816181C - msgbox gUnknown_8175E80, 3 + msgbox gUnknown_8175E80, MSGBOX_SIGN end SilphCo_5F_EventScript_161825:: @ 8161825 trainerbattle_single TRAINER_SCIENTIST_BEAU, Text_175C40, Text_175C6D - msgbox gUnknown_8175C7D, 6 + msgbox gUnknown_8175C7D, MSGBOX_AUTOCLOSE end SilphCo_5F_EventScript_16183C:: @ 816183C trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, Text_175BE5, Text_175C09 - msgbox gUnknown_8175C0F, 6 + msgbox gUnknown_8175C0F, MSGBOX_AUTOCLOSE end SilphCo_5F_EventScript_161853:: @ 8161853 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, Text_175D28, Text_175D4B - msgbox gUnknown_8175D59, 6 + msgbox gUnknown_8175D59, MSGBOX_AUTOCLOSE end SilphCo_5F_EventScript_16186A:: @ 816186A trainerbattle_single TRAINER_JUGGLER_DALTON, Text_175CBD, Text_175CEB - msgbox gUnknown_8175CF9, 6 + msgbox gUnknown_8175CF9, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index 53fb04ac4..6bc5cd545 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -77,20 +77,20 @@ EventScript_16192C:: @ 816192C end SilphCo_6F_EventScript_161936:: @ 8161936 - msgbox gUnknown_817624D, 3 + msgbox gUnknown_817624D, MSGBOX_SIGN end SilphCo_6F_EventScript_16193F:: @ 816193F trainerbattle_single TRAINER_SCIENTIST_TAYLOR, Text_176136, Text_1761BD - msgbox gUnknown_81761C4, 6 + msgbox gUnknown_81761C4, MSGBOX_AUTOCLOSE end SilphCo_6F_EventScript_161956:: @ 8161956 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, Text_1760DE, Text_176104 - msgbox gUnknown_817610F, 6 + msgbox gUnknown_817610F, MSGBOX_AUTOCLOSE end SilphCo_6F_EventScript_16196D:: @ 816196D trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, Text_1761F1, Text_17620E - msgbox gUnknown_817621B, 6 + msgbox gUnknown_817621B, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 1fa3d3862..5e7a0ea89 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -148,7 +148,7 @@ EventScript_161B12:: @ 8161B12 waitfanfare getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_161B7E call EventScript_1A8C27 call EventScript_1A74EB @@ -165,7 +165,7 @@ EventScript_161B45:: @ 8161B45 waitfanfare getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_161B73 call EventScript_1A8C33 goto EventScript_161B73 @@ -235,25 +235,25 @@ EventScript_161BF0:: @ 8161BF0 end SilphCo_7F_EventScript_161BFA:: @ 8161BFA - msgbox gUnknown_8176954, 3 + msgbox gUnknown_8176954, MSGBOX_SIGN end SilphCo_7F_EventScript_161C03:: @ 8161C03 trainerbattle_single TRAINER_SCIENTIST_JOSHUA, Text_1765E2, Text_17660C - msgbox gUnknown_8176616, 6 + msgbox gUnknown_8176616, MSGBOX_AUTOCLOSE end SilphCo_7F_EventScript_161C1A:: @ 8161C1A trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, Text_176643, Text_176669 - msgbox gUnknown_8176681, 6 + msgbox gUnknown_8176681, MSGBOX_AUTOCLOSE end SilphCo_7F_EventScript_161C31:: @ 8161C31 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, Text_1766B3, Text_1766D7 - msgbox gUnknown_81766E5, 6 + msgbox gUnknown_81766E5, MSGBOX_AUTOCLOSE end SilphCo_7F_EventScript_161C48:: @ 8161C48 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, Text_176586, Text_1765A5 - msgbox gUnknown_81765B1, 6 + msgbox gUnknown_81765B1, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 84993bf67..f96188c3f 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -21,20 +21,20 @@ EventScript_161C86:: @ 8161C86 end SilphCo_8F_EventScript_161C90:: @ 8161C90 - msgbox gUnknown_8176AB2, 3 + msgbox gUnknown_8176AB2, MSGBOX_SIGN end SilphCo_8F_EventScript_161C99:: @ 8161C99 trainerbattle_single TRAINER_SCIENTIST_PARKER, Text_1769FD, Text_176A19 - msgbox gUnknown_8176A26, 6 + msgbox gUnknown_8176A26, MSGBOX_AUTOCLOSE end SilphCo_8F_EventScript_161CB0:: @ 8161CB0 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, Text_1769A2, Text_1769BE - msgbox gUnknown_81769CF, 6 + msgbox gUnknown_81769CF, MSGBOX_AUTOCLOSE end SilphCo_8F_EventScript_161CC7:: @ 8161CC7 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, Text_176A56, Text_176A7C - msgbox gUnknown_8176A90, 6 + msgbox gUnknown_8176A90, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 737cf5f71..87df12d97 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -27,20 +27,20 @@ EventScript_161D2E:: @ 8161D2E end SilphCo_9F_EventScript_161D38:: @ 8161D38 - msgbox gUnknown_8176CD4, 3 + msgbox gUnknown_8176CD4, MSGBOX_SIGN end SilphCo_9F_EventScript_161D41:: @ 8161D41 trainerbattle_single TRAINER_SCIENTIST_ED, Text_176BFB, Text_176C2B - msgbox gUnknown_8176C3C, 6 + msgbox gUnknown_8176C3C, MSGBOX_AUTOCLOSE end SilphCo_9F_EventScript_161D58:: @ 8161D58 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, Text_176BA3, Text_176BC8 - msgbox gUnknown_8176BD0, 6 + msgbox gUnknown_8176BD0, MSGBOX_AUTOCLOSE end SilphCo_9F_EventScript_161D6F:: @ 8161D6F trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, Text_176C7A, Text_176CA0 - msgbox gUnknown_8176CB8, 6 + msgbox gUnknown_8176CB8, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SixIsland/scripts.inc b/data/maps/SixIsland/scripts.inc index 868eefbaa..01d373654 100644 --- a/data/maps/SixIsland/scripts.inc +++ b/data/maps/SixIsland/scripts.inc @@ -7,13 +7,13 @@ SixIsland_OnTransition:: @ 8167EDE end SixIsland_EventScript_167EE2:: @ 8167EE2 - msgbox gUnknown_81831EF, 2 + msgbox gUnknown_81831EF, MSGBOX_NPC end SixIsland_EventScript_167EEB:: @ 8167EEB - msgbox gUnknown_8183255, 2 + msgbox gUnknown_8183255, MSGBOX_NPC end SixIsland_EventScript_167EF4:: @ 8167EF4 - msgbox gUnknown_81831C6, 3 + msgbox gUnknown_81831C6, MSGBOX_SIGN end diff --git a/data/maps/SixIsland_GreenPath/scripts.inc b/data/maps/SixIsland_GreenPath/scripts.inc index c2822ccca..acc4336d2 100644 --- a/data/maps/SixIsland_GreenPath/scripts.inc +++ b/data/maps/SixIsland_GreenPath/scripts.inc @@ -2,9 +2,9 @@ SixIsland_GreenPath_MapScripts:: @ 8168B2D .byte 0 SixIsland_GreenPath_EventScript_168B2E:: @ 8168B2E - msgbox gUnknown_818B84D, 3 + msgbox gUnknown_818B84D, MSGBOX_SIGN end SixIsland_GreenPath_EventScript_168B37:: @ 8168B37 - msgbox gUnknown_818B86B, 3 + msgbox gUnknown_818B86B, MSGBOX_SIGN end diff --git a/data/maps/SixIsland_House/scripts.inc b/data/maps/SixIsland_House/scripts.inc index bc6753abb..1ad94906f 100644 --- a/data/maps/SixIsland_House/scripts.inc +++ b/data/maps/SixIsland_House/scripts.inc @@ -2,5 +2,5 @@ SixIsland_House_MapScripts:: @ 8171E5B .byte 0 SixIsland_House_EventScript_171E5C:: @ 8171E5C - msgbox gUnknown_81A412E, 2 + msgbox gUnknown_81A412E, MSGBOX_NPC end diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index 1da8aa3dc..af865be28 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -29,5 +29,5 @@ Items_171E8C:: @ 8171E8C end SixIsland_Mart_EventScript_171EA0:: @ 8171EA0 - msgbox gUnknown_81A4271, 2 + msgbox gUnknown_81A4271, MSGBOX_NPC end diff --git a/data/maps/SixIsland_OutcastIsland/scripts.inc b/data/maps/SixIsland_OutcastIsland/scripts.inc index 1a754362f..fb4ec0217 100644 --- a/data/maps/SixIsland_OutcastIsland/scripts.inc +++ b/data/maps/SixIsland_OutcastIsland/scripts.inc @@ -3,5 +3,5 @@ SixIsland_OutcastIsland_MapScripts:: @ 8168B15 SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16 trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_46, Text_18B35A, Text_18B3C2 - msgbox gUnknown_818B3C8, 6 + msgbox gUnknown_818B3C8, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index 4d6f63b07..97a8a0a30 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -21,60 +21,60 @@ EventScript_164587:: @ 8164587 SixIsland_PatternBush_EventScript_164590:: @ 8164590 trainerbattle_single TRAINER_PKMN_BREEDER_BETHANY, Text_17BF3A, Text_17BF66 - msgbox gUnknown_817BF97, 6 + msgbox gUnknown_817BF97, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7 trainerbattle_single TRAINER_PKMN_BREEDER_ALLISON, Text_17BFEB, Text_17C028 - msgbox gUnknown_817C056, 6 + msgbox gUnknown_817C056, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE trainerbattle_single TRAINER_BUG_CATCHER_GARRET, Text_17C0BE, Text_17C0F2 - msgbox gUnknown_817C113, 6 + msgbox gUnknown_817C113, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5 trainerbattle_single TRAINER_BUG_CATCHER_JONAH, Text_17C155, Text_17C196 - msgbox gUnknown_817C1D0, 6 + msgbox gUnknown_817C1D0, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC trainerbattle_single TRAINER_BUG_CATCHER_VANCE, Text_17C246, Text_17C275 - msgbox gUnknown_817C2A4, 6 + msgbox gUnknown_817C2A4, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_164603:: @ 8164603 trainerbattle_single TRAINER_YOUNGSTER_NASH, Text_17C2D9, Text_17C30D - msgbox gUnknown_817C31C, 6 + msgbox gUnknown_817C31C, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_16461A:: @ 816461A trainerbattle_single TRAINER_YOUNGSTER_CORDELL, Text_17C373, Text_17C3A5 - msgbox gUnknown_817C3CE, 6 + msgbox gUnknown_817C3CE, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_164631:: @ 8164631 trainerbattle_single TRAINER_LASS_DALIA, Text_17C42B, Text_17C458 - msgbox gUnknown_817C490, 6 + msgbox gUnknown_817C490, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_164648:: @ 8164648 trainerbattle_single TRAINER_LASS_JOANA, Text_17C4FE, Text_17C552 - msgbox gUnknown_817C590, 6 + msgbox gUnknown_817C590, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_16465F:: @ 816465F trainerbattle_single TRAINER_CAMPER_RILEY, Text_17C5DB, Text_17C609 - msgbox gUnknown_817C615, 6 + msgbox gUnknown_817C615, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_164676:: @ 8164676 trainerbattle_single TRAINER_PICNICKER_MARCY, Text_17C63E, Text_17C660 - msgbox gUnknown_817C68E, 6 + msgbox gUnknown_817C68E, MSGBOX_AUTOCLOSE end SixIsland_PatternBush_EventScript_16468D:: @ 816468D trainerbattle_single TRAINER_RUIN_MANIAC_LAYTON, Text_17C6C9, Text_17C6FB - msgbox gUnknown_817C728, 6 + msgbox gUnknown_817C728, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 570d65b4b..3316ec0b5 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -71,9 +71,9 @@ SixIsland_PokemonCenter_1F_EventScript_171E05:: @ 8171E05 end SixIsland_PokemonCenter_1F_EventScript_171E0E:: @ 8171E0E - msgbox gUnknown_81A3E02, 2 + msgbox gUnknown_81A3E02, MSGBOX_NPC end SixIsland_PokemonCenter_1F_EventScript_171E17:: @ 8171E17 - msgbox gUnknown_81A3E87, 2 + msgbox gUnknown_81A3E87, MSGBOX_NPC end diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 3246909ae..582503ed8 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -25,7 +25,7 @@ SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 lockall goto_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, EventScript_168BC1 msgbox gUnknown_818BDC0, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_168BCB msgbox gUnknown_818BE11 braillemessage gUnknown_81A929B diff --git a/data/maps/SixIsland_WaterPath/scripts.inc b/data/maps/SixIsland_WaterPath/scripts.inc index 2b410f112..27f49d4aa 100644 --- a/data/maps/SixIsland_WaterPath/scripts.inc +++ b/data/maps/SixIsland_WaterPath/scripts.inc @@ -2,9 +2,9 @@ SixIsland_WaterPath_MapScripts:: @ 8168B40 .byte 0 SixIsland_WaterPath_EventScript_168B41:: @ 8168B41 - msgbox gUnknown_818BD0C, 3 + msgbox gUnknown_818BD0C, MSGBOX_SIGN end SixIsland_WaterPath_EventScript_168B4A:: @ 8168B4A - msgbox gUnknown_818BD27, 3 + msgbox gUnknown_818BD27, MSGBOX_SIGN end diff --git a/data/maps/SixIsland_WaterPath_House2/scripts.inc b/data/maps/SixIsland_WaterPath_House2/scripts.inc index ed5e24c7f..4cb8e9827 100644 --- a/data/maps/SixIsland_WaterPath_House2/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House2/scripts.inc @@ -2,5 +2,5 @@ SixIsland_WaterPath_House2_MapScripts:: @ 8172178 .byte 0 SixIsland_WaterPath_House2_EventScript_172179:: @ 8172179 - msgbox gUnknown_81A4D0D, 2 + msgbox gUnknown_81A4D0D, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 9f546cbf2..82d922cb1 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -221,7 +221,7 @@ EventScript_167A59:: @ 8167A59 waitmovement 0 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81823ED, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_167C35 msgbox gUnknown_818247D setvar VAR_LAST_TALKED, 5 @@ -382,11 +382,11 @@ Movement_167C71:: @ 8167C71 step_end ThreeIsland_EventScript_167C77:: @ 8167C77 - msgbox gUnknown_81828EB, 2 + msgbox gUnknown_81828EB, MSGBOX_NPC end ThreeIsland_EventScript_167C80:: @ 8167C80 - msgbox gUnknown_818298A, 2 + msgbox gUnknown_818298A, MSGBOX_NPC end ThreeIsland_EventScript_167C89:: @ 8167C89 @@ -400,9 +400,9 @@ ThreeIsland_EventScript_167C89:: @ 8167C89 end ThreeIsland_EventScript_167C9C:: @ 8167C9C - msgbox gUnknown_8182061, 3 + msgbox gUnknown_8182061, MSGBOX_SIGN end ThreeIsland_EventScript_167CA5:: @ 8167CA5 - msgbox gUnknown_818208B, 2 + msgbox gUnknown_818208B, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 8aeb7ac30..9ac90a4c4 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -57,9 +57,9 @@ Movement_163D22:: @ 8163D22 step_end ThreeIsland_BerryForest_EventScript_163D28:: @ 8163D28 - msgbox gUnknown_817AFD6, 3 + msgbox gUnknown_817AFD6, MSGBOX_SIGN end ThreeIsland_BerryForest_EventScript_163D31:: @ 8163D31 - msgbox gUnknown_817B029, 3 + msgbox gUnknown_817B029, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_BondBridge/scripts.inc b/data/maps/ThreeIsland_BondBridge/scripts.inc index 008e748d7..f36889d04 100644 --- a/data/maps/ThreeIsland_BondBridge/scripts.inc +++ b/data/maps/ThreeIsland_BondBridge/scripts.inc @@ -2,9 +2,9 @@ ThreeIsland_BondBridge_MapScripts:: @ 8168776 .byte 0 ThreeIsland_BondBridge_EventScript_168777:: @ 8168777 - msgbox gUnknown_818A210, 3 + msgbox gUnknown_818A210, MSGBOX_SIGN end ThreeIsland_BondBridge_EventScript_168780:: @ 8168780 - msgbox gUnknown_818A223, 3 + msgbox gUnknown_818A223, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_House1/scripts.inc b/data/maps/ThreeIsland_House1/scripts.inc index 7738d2e5c..007f7d4be 100644 --- a/data/maps/ThreeIsland_House1/scripts.inc +++ b/data/maps/ThreeIsland_House1/scripts.inc @@ -10,5 +10,5 @@ ThreeIsland_House1_EventScript_17181A:: @ 817181A end ThreeIsland_House1_EventScript_171829:: @ 8171829 - msgbox gUnknown_81A2F92, 3 + msgbox gUnknown_81A2F92, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_House2/scripts.inc b/data/maps/ThreeIsland_House2/scripts.inc index 6c45d3f2f..a9fd52298 100644 --- a/data/maps/ThreeIsland_House2/scripts.inc +++ b/data/maps/ThreeIsland_House2/scripts.inc @@ -10,5 +10,5 @@ ThreeIsland_House2_EventScript_1718E0:: @ 81718E0 end ThreeIsland_House2_EventScript_1718F9:: @ 81718F9 - msgbox gUnknown_81A3245, 2 + msgbox gUnknown_81A3245, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House3/scripts.inc b/data/maps/ThreeIsland_House3/scripts.inc index 7ad4b0da0..b1c336d79 100644 --- a/data/maps/ThreeIsland_House3/scripts.inc +++ b/data/maps/ThreeIsland_House3/scripts.inc @@ -2,5 +2,5 @@ ThreeIsland_House3_MapScripts:: @ 8171902 .byte 0 ThreeIsland_House3_EventScript_171903:: @ 8171903 - msgbox gUnknown_81A3379, 2 + msgbox gUnknown_81A3379, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House4/scripts.inc b/data/maps/ThreeIsland_House4/scripts.inc index 6bb77d0bc..d0facf443 100644 --- a/data/maps/ThreeIsland_House4/scripts.inc +++ b/data/maps/ThreeIsland_House4/scripts.inc @@ -2,9 +2,9 @@ ThreeIsland_House4_MapScripts:: @ 817190C .byte 0 ThreeIsland_House4_EventScript_17190D:: @ 817190D - msgbox gUnknown_81A33DB, 2 + msgbox gUnknown_81A33DB, MSGBOX_NPC end ThreeIsland_House4_EventScript_171916:: @ 8171916 - msgbox gUnknown_81A342F, 2 + msgbox gUnknown_81A342F, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index b6e488c03..3ac12bf36 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -27,13 +27,13 @@ Items_1718B4:: @ 81718B4 end ThreeIsland_Mart_EventScript_1718C4:: @ 81718C4 - msgbox gUnknown_81A3114, 2 + msgbox gUnknown_81A3114, MSGBOX_NPC end ThreeIsland_Mart_EventScript_1718CD:: @ 81718CD - msgbox gUnknown_81A315C, 2 + msgbox gUnknown_81A315C, MSGBOX_NPC end ThreeIsland_Mart_EventScript_1718D6:: @ 81718D6 - msgbox gUnknown_81A31F0, 2 + msgbox gUnknown_81A31F0, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index 96cfb8b74..e3cb1e23b 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841 end ThreeIsland_PokemonCenter_1F_EventScript_17184A:: @ 817184A - msgbox gUnknown_81A303B, 2 + msgbox gUnknown_81A303B, MSGBOX_NPC end ThreeIsland_PokemonCenter_1F_EventScript_171853:: @ 8171853 - msgbox gUnknown_81A30A3, 2 + msgbox gUnknown_81A30A3, MSGBOX_NPC end ThreeIsland_PokemonCenter_1F_EventScript_17185C:: @ 817185C - msgbox gUnknown_81A2FB5, 2 + msgbox gUnknown_81A2FB5, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 1764efd7b..f7aa40e76 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -29,7 +29,7 @@ EventScript_1687C2:: @ 81687C2 end ThreeIsland_Port_EventScript_1687CC:: @ 81687CC - msgbox gUnknown_818A261, 2 + msgbox gUnknown_818A261, MSGBOX_NPC end ThreeIsland_Port_EventScript_1687D5:: @ 81687D5 diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 3bc899bef..b785d2fd9 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -185,11 +185,11 @@ Items_167738:: @ 8167738 end TwoIsland_EventScript_16774C:: @ 816774C - msgbox gUnknown_8181D2F, 2 + msgbox gUnknown_8181D2F, MSGBOX_NPC end TwoIsland_EventScript_167755:: @ 8167755 - msgbox gUnknown_8181DCA, 2 + msgbox gUnknown_8181DCA, MSGBOX_NPC end TwoIsland_EventScript_16775E:: @ 816775E @@ -201,25 +201,25 @@ TwoIsland_EventScript_16775E:: @ 816775E end TwoIsland_EventScript_167777:: @ 8167777 - msgbox gUnknown_8181F28, 2 + msgbox gUnknown_8181F28, MSGBOX_NPC end TwoIsland_EventScript_167780:: @ 8167780 - msgbox gUnknown_8181F5D, 2 + msgbox gUnknown_8181F5D, MSGBOX_NPC end TwoIsland_EventScript_167789:: @ 8167789 - msgbox gUnknown_8181FCE, 2 + msgbox gUnknown_8181FCE, MSGBOX_NPC end TwoIsland_EventScript_167792:: @ 8167792 - msgbox gUnknown_8181A88, 3 + msgbox gUnknown_8181A88, MSGBOX_SIGN end TwoIsland_EventScript_16779B:: @ 816779B - msgbox gUnknown_8181AA7, 3 + msgbox gUnknown_8181AA7, MSGBOX_SIGN end TwoIsland_EventScript_1677A4:: @ 81677A4 - msgbox gUnknown_8181AC8, 3 + msgbox gUnknown_8181AC8, MSGBOX_SIGN end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 68dc50ae8..7e6c06d8b 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -41,7 +41,7 @@ EventScript_171696:: @ 8171696 EventScript_1716A5:: @ 81716A5 msgbox gUnknown_81A2C63, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_17179E goto EventScript_1716BE end diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index fb1ccc7b4..c5da2e223 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -15,9 +15,9 @@ TwoIsland_PokemonCenter_1F_EventScript_1717C3:: @ 81717C3 end TwoIsland_PokemonCenter_1F_EventScript_1717CC:: @ 81717CC - msgbox gUnknown_81A2E59, 2 + msgbox gUnknown_81A2E59, MSGBOX_NPC end TwoIsland_PokemonCenter_1F_EventScript_1717D5:: @ 81717D5 - msgbox gUnknown_81A2EBE, 2 + msgbox gUnknown_81A2EBE, MSGBOX_NPC end diff --git a/data/maps/UndergroundPath_EastEntrance/scripts.inc b/data/maps/UndergroundPath_EastEntrance/scripts.inc index 31ee9f7af..28a211c6f 100644 --- a/data/maps/UndergroundPath_EastEntrance/scripts.inc +++ b/data/maps/UndergroundPath_EastEntrance/scripts.inc @@ -2,5 +2,5 @@ UndergroundPath_EastEntrance_MapScripts:: @ 8160EDD .byte 0 UndergroundPath_EastEntrance_EventScript_160EDE:: @ 8160EDE - msgbox gUnknown_81745D9, 2 + msgbox gUnknown_81745D9, MSGBOX_NPC end diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index 55a810d64..2a1e4ed4f 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -8,7 +8,7 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 call EventScript_1A8CAD goto_if_set FLAG_DID_MS_NIDO_TRADE, EventScript_160EAB msgbox gUnknown_81A5AD6, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_160E93 call EventScript_1A8CBD compare VAR_0x8004, 6 diff --git a/data/maps/UndergroundPath_SouthEntrance/scripts.inc b/data/maps/UndergroundPath_SouthEntrance/scripts.inc index 1e3d2e6e3..1623d16d7 100644 --- a/data/maps/UndergroundPath_SouthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_SouthEntrance/scripts.inc @@ -2,5 +2,5 @@ UndergroundPath_SouthEntrance_MapScripts:: @ 8160EBF .byte 0 UndergroundPath_SouthEntrance_EventScript_160EC0:: @ 8160EC0 - msgbox gUnknown_8174559, 2 + msgbox gUnknown_8174559, MSGBOX_NPC end diff --git a/data/maps/UndergroundPath_WestEntrance/scripts.inc b/data/maps/UndergroundPath_WestEntrance/scripts.inc index f56217bce..6b1c60710 100644 --- a/data/maps/UndergroundPath_WestEntrance/scripts.inc +++ b/data/maps/UndergroundPath_WestEntrance/scripts.inc @@ -2,5 +2,5 @@ UndergroundPath_WestEntrance_MapScripts:: @ 8160EC9 .byte 0 UndergroundPath_WestEntrance_EventScript_160ECA:: @ 8160ECA - msgbox gUnknown_817459B, 2 + msgbox gUnknown_817459B, MSGBOX_NPC end diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 8de5d1e26..cb287134a 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -30,7 +30,7 @@ EventScript_166913:: @ 8166913 return VermilionCity_EventScript_166917:: @ 8166917 - msgbox gUnknown_817F723, 2 + msgbox gUnknown_817F723, MSGBOX_NPC end VermilionCity_EventScript_166920:: @ 8166920 @@ -229,7 +229,7 @@ EventScript_166BED:: @ 8166BED end VermilionCity_EventScript_166C17:: @ 8166C17 - msgbox gUnknown_817F8AC, 2 + msgbox gUnknown_817F8AC, MSGBOX_NPC end VermilionCity_EventScript_166C20:: @ 8166C20 @@ -241,7 +241,7 @@ VermilionCity_EventScript_166C20:: @ 8166C20 end VermilionCity_EventScript_166C2F:: @ 8166C2F - msgbox gUnknown_817F7FD, 2 + msgbox gUnknown_817F7FD, MSGBOX_NPC end VermilionCity_EventScript_166C38:: @ 8166C38 @@ -256,15 +256,15 @@ VermilionCity_EventScript_166C38:: @ 8166C38 end VermilionCity_EventScript_166C53:: @ 8166C53 - msgbox gUnknown_817F8FB, 3 + msgbox gUnknown_817F8FB, MSGBOX_SIGN end VermilionCity_EventScript_166C5C:: @ 8166C5C - msgbox gUnknown_817F928, 3 + msgbox gUnknown_817F928, MSGBOX_SIGN end VermilionCity_EventScript_166C65:: @ 8166C65 - msgbox gUnknown_817F9A1, 3 + msgbox gUnknown_817F9A1, MSGBOX_SIGN end VermilionCity_EventScript_166C6E:: @ 8166C6E @@ -275,5 +275,5 @@ VermilionCity_EventScript_166C6E:: @ 8166C6E end VermilionCity_EventScript_166C86:: @ 8166C86 - msgbox gUnknown_817FA11, 3 + msgbox gUnknown_817FA11, MSGBOX_SIGN end diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index aaa029052..a3be8b958 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -243,18 +243,18 @@ EventScript_16B9F0:: @ 816B9F0 VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA trainerbattle_single TRAINER_SAILOR_DWAYNE, Text_194FBD, Text_194FF1 famechecker FAMECHECKER_LTSURGE, 4 - msgbox gUnknown_8195004, 6 + msgbox gUnknown_8195004, MSGBOX_AUTOCLOSE end VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E trainerbattle_single TRAINER_ENGINEER_BAILY, Text_194F1F, Text_194F6F - msgbox gUnknown_8194F76, 6 + msgbox gUnknown_8194F76, MSGBOX_AUTOCLOSE end VermilionCity_Gym_EventScript_16BA35:: @ 816BA35 trainerbattle_single TRAINER_GENTLEMAN_TUCKER, Text_194E57, Text_194EA5, EventScript_16BA5D famechecker FAMECHECKER_LTSURGE, 3 - msgbox gUnknown_8194EBD, 6 + msgbox gUnknown_8194EBD, MSGBOX_AUTOCLOSE end EventScript_16BA5D:: @ 816BA5D diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index f0b5f75e8..cdf4aea91 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -6,7 +6,7 @@ VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 faceplayer goto_if_set FLAG_GOT_OLD_ROD, EventScript_16B3CF msgbox gUnknown_8193EC1, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16B3D9 msgbox gUnknown_8194028 release diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc index ca192abf4..6b647952e 100644 --- a/data/maps/VermilionCity_House2/scripts.inc +++ b/data/maps/VermilionCity_House2/scripts.inc @@ -8,7 +8,7 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 call EventScript_1A8CAD goto_if_set FLAG_DID_CH_DING_TRADE, EventScript_16B649 msgbox gUnknown_81949CB, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16B631 call EventScript_1A8CBD compare VAR_0x8004, 6 diff --git a/data/maps/VermilionCity_House3/scripts.inc b/data/maps/VermilionCity_House3/scripts.inc index 1344aac52..8f9de55e0 100644 --- a/data/maps/VermilionCity_House3/scripts.inc +++ b/data/maps/VermilionCity_House3/scripts.inc @@ -2,11 +2,11 @@ VermilionCity_House3_MapScripts:: @ 816BAA9 .byte 0 VermilionCity_House3_EventScript_16BAAA:: @ 816BAAA - msgbox gUnknown_81953AF, 2 + msgbox gUnknown_81953AF, MSGBOX_NPC end VermilionCity_House3_EventScript_16BAB3:: @ 816BAB3 - msgbox gUnknown_8195471, 2 + msgbox gUnknown_8195471, MSGBOX_NPC end VermilionCity_House3_EventScript_16BABC:: @ 816BABC @@ -20,5 +20,5 @@ VermilionCity_House3_EventScript_16BABC:: @ 816BABC end VermilionCity_House3_EventScript_16BACF:: @ 816BACF - msgbox gUnknown_8195400, 3 + msgbox gUnknown_8195400, MSGBOX_SIGN end diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index 1c342fc1c..56ff2d7c0 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -2,11 +2,11 @@ VermilionCity_Mart_MapScripts:: @ 816B653 .byte 0 VermilionCity_Mart_EventScript_16B654:: @ 816B654 - msgbox gUnknown_8194B65, 2 + msgbox gUnknown_8194B65, MSGBOX_NPC end VermilionCity_Mart_EventScript_16B65D:: @ 816B65D - msgbox gUnknown_8194A77, 2 + msgbox gUnknown_8194A77, MSGBOX_NPC end VermilionCity_Mart_EventScript_16B666:: @ 816B666 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index 9e2b4f752..40ead09e0 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433 end VermilionCity_PokemonCenter_1F_EventScript_16B43C:: @ 816B43C - msgbox gUnknown_8194145, 2 + msgbox gUnknown_8194145, MSGBOX_NPC end VermilionCity_PokemonCenter_1F_EventScript_16B445:: @ 816B445 - msgbox gUnknown_81940AF, 2 + msgbox gUnknown_81940AF, MSGBOX_NPC end VermilionCity_PokemonCenter_1F_EventScript_16B44E:: @ 816B44E - msgbox gUnknown_8194180, 2 + msgbox gUnknown_8194180, MSGBOX_NPC end diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 42d810120..f2df7d231 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -6,7 +6,7 @@ VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F faceplayer goto_if_set FLAG_GOT_BIKE_VOUCHER, EventScript_16B4A7 msgbox gUnknown_819457E, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_16B4B1 msgbox gUnknown_8194860 release @@ -110,9 +110,9 @@ VermilionCity_PokemonFanClub_EventScript_16B5B1:: @ 816B5B1 end VermilionCity_PokemonFanClub_EventScript_16B5C4:: @ 816B5C4 - msgbox gUnknown_8194910, 3 + msgbox gUnknown_8194910, MSGBOX_SIGN end VermilionCity_PokemonFanClub_EventScript_16B5CD:: @ 816B5CD - msgbox gUnknown_819493D, 3 + msgbox gUnknown_819493D, MSGBOX_SIGN end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 255c5e240..79d01278f 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -37,10 +37,10 @@ EventScript_160F62:: @ 8160F62 VictoryRoad_1F_EventScript_160F64:: @ 8160F64 trainerbattle_single TRAINER_COOLTRAINER_NAOMI, Text_174710, Text_174738 - msgbox gUnknown_8174744, 6 + msgbox gUnknown_8174744, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, Text_174784, Text_1747B8 - msgbox gUnknown_81747C8, 6 + msgbox gUnknown_81747C8, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index 1e08d2265..49d21b7de 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -57,25 +57,25 @@ EventScript_161035:: @ 8161035 VictoryRoad_2F_EventScript_161037:: @ 8161037 trainerbattle_single TRAINER_POKEMANIAC_DAWSON, Text_1747EF, Text_17482C - msgbox gUnknown_817483E, 6 + msgbox gUnknown_817483E, MSGBOX_AUTOCLOSE end VictoryRoad_2F_EventScript_16104E:: @ 816104E trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, Text_174877, Text_1748B4 - msgbox gUnknown_81748BB, 6 + msgbox gUnknown_81748BB, MSGBOX_AUTOCLOSE end VictoryRoad_2F_EventScript_161065:: @ 8161065 trainerbattle_single TRAINER_JUGGLER_NELSON, Text_1748EE, Text_17491B - msgbox gUnknown_8174927, 6 + msgbox gUnknown_8174927, MSGBOX_AUTOCLOSE end VictoryRoad_2F_EventScript_16107C:: @ 816107C trainerbattle_single TRAINER_JUGGLER_GREGORY, Text_174995, Text_1749B0 - msgbox gUnknown_81749BB, 6 + msgbox gUnknown_81749BB, MSGBOX_AUTOCLOSE end VictoryRoad_2F_EventScript_161093:: @ 8161093 trainerbattle_single TRAINER_TAMER_VINCENT, Text_174942, Text_17495A - msgbox gUnknown_8174969, 6 + msgbox gUnknown_8174969, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 8e12ddf79..4cd011f92 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -33,30 +33,30 @@ EventScript_161101:: @ 8161101 VictoryRoad_3F_EventScript_161103:: @ 8161103 trainerbattle_single TRAINER_COOLTRAINER_GEORGE, Text_174B60, Text_174B83 - msgbox gUnknown_8174B99, 6 + msgbox gUnknown_8174B99, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_16111A:: @ 816111A trainerbattle_single TRAINER_COOLTRAINER_COLBY, Text_174C8A, Text_174CA9 - msgbox gUnknown_8174CBD, 6 + msgbox gUnknown_8174CBD, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_161131:: @ 8161131 trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, Text_174C30, Text_174C5A - msgbox gUnknown_8174C67, 6 + msgbox gUnknown_8174C67, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_161148:: @ 8161148 trainerbattle_single TRAINER_COOLTRAINER_ALEXA, Text_174BCA, Text_174BF4 - msgbox gUnknown_8174C03, 6 + msgbox gUnknown_8174C03, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_16115F:: @ 816115F trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174D0C, Text_174D45, Text_174D96 - msgbox gUnknown_8174D64, 6 + msgbox gUnknown_8174D64, MSGBOX_AUTOCLOSE end VictoryRoad_3F_EventScript_16117A:: @ 816117A trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174E08, Text_174E39, Text_174E8D - msgbox gUnknown_8174E48, 6 + msgbox gUnknown_8174E48, MSGBOX_AUTOCLOSE end diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index f87c5ac12..c99ff83ec 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -58,27 +58,27 @@ Movement_165992:: @ 8165992 step_end ViridianCity_EventScript_165994:: @ 8165994 - msgbox gUnknown_817E1BB, 3 + msgbox gUnknown_817E1BB, MSGBOX_SIGN end ViridianCity_EventScript_16599D:: @ 816599D - msgbox gUnknown_817E1E7, 3 + msgbox gUnknown_817E1E7, MSGBOX_SIGN end ViridianCity_EventScript_1659A6:: @ 81659A6 - msgbox gUnknown_817E24D, 3 + msgbox gUnknown_817E24D, MSGBOX_SIGN end ViridianCity_EventScript_1659AF:: @ 81659AF - msgbox gUnknown_817E2DB, 3 + msgbox gUnknown_817E2DB, MSGBOX_SIGN end ViridianCity_EventScript_1659B8:: @ 81659B8 - msgbox gUnknown_817E2F5, 3 + msgbox gUnknown_817E2F5, MSGBOX_SIGN end ViridianCity_EventScript_1659C1:: @ 81659C1 - msgbox gUnknown_817DABB, 2 + msgbox gUnknown_817DABB, MSGBOX_NPC end ViridianCity_EventScript_1659CA:: @ 81659CA @@ -112,7 +112,7 @@ ViridianCity_EventScript_1659F6:: @ 81659F6 EventScript_165A23:: @ 8165A23 msgbox gUnknown_817E046, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_165A40 msgbox gUnknown_817E0EA release @@ -159,9 +159,9 @@ ViridianCity_EventScript_165A8F:: @ 8165A8F lock faceplayer msgbox gUnknown_817DB98, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_165AB0 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_165ABA end diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index f119d51d1..92b9b8e5d 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -41,42 +41,42 @@ EventScript_169F70:: @ 8169F70 ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A trainerbattle_single TRAINER_TAMER_JASON, Text_18F7F3, Text_18F824 - msgbox gUnknown_818F840, 6 + msgbox gUnknown_818F840, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169F91:: @ 8169F91 trainerbattle_single TRAINER_TAMER_COLE, Text_18F98A, Text_18F9BB - msgbox gUnknown_818F9CC, 6 + msgbox gUnknown_818F9CC, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8 trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, Text_18F7AD, Text_18F7D6 - msgbox gUnknown_818F7DD, 6 + msgbox gUnknown_818F7DD, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF trainerbattle_single TRAINER_BLACK_BELT_KIYO, Text_18F86C, Text_18F899 - msgbox gUnknown_818F8A0, 6 + msgbox gUnknown_818F8A0, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6 trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, Text_18F92C, Text_18F95A - msgbox gUnknown_818F960, 6 + msgbox gUnknown_818F960, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_169FED:: @ 8169FED trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, Text_18F9E7, Text_18FA2D - msgbox gUnknown_818FA3B, 6 + msgbox gUnknown_818FA3B, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_16A004:: @ 816A004 trainerbattle_single TRAINER_COOLTRAINER_YUJI, Text_18F73B, Text_18F769 - msgbox gUnknown_818F77B, 6 + msgbox gUnknown_818F77B, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_16A01B:: @ 816A01B trainerbattle_single TRAINER_COOLTRAINER_WARREN, Text_18F8CB, Text_18F8EE - msgbox gUnknown_818F8FE, 6 + msgbox gUnknown_818F8FE, MSGBOX_AUTOCLOSE end ViridianCity_Gym_EventScript_16A032:: @ 816A032 diff --git a/data/maps/ViridianCity_House1/scripts.inc b/data/maps/ViridianCity_House1/scripts.inc index b82b0ed2f..446035efe 100644 --- a/data/maps/ViridianCity_House1/scripts.inc +++ b/data/maps/ViridianCity_House1/scripts.inc @@ -2,11 +2,11 @@ ViridianCity_House1_MapScripts:: @ 8169E9A .byte 0 ViridianCity_House1_EventScript_169E9B:: @ 8169E9B - msgbox gUnknown_818F292, 2 + msgbox gUnknown_818F292, MSGBOX_NPC end ViridianCity_House1_EventScript_169EA4:: @ 8169EA4 - msgbox gUnknown_818F30F, 2 + msgbox gUnknown_818F30F, MSGBOX_NPC end ViridianCity_House1_EventScript_169EAD:: @ 8169EAD @@ -20,5 +20,5 @@ ViridianCity_House1_EventScript_169EAD:: @ 8169EAD end ViridianCity_House1_EventScript_169EC0:: @ 8169EC0 - msgbox gUnknown_818F33D, 3 + msgbox gUnknown_818F33D, MSGBOX_SIGN end diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index a897b3f1f..6a0845622 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -25,15 +25,15 @@ ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB lockall msgbox gUnknown_818FC65 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16A11B msgbox gUnknown_818FD23 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16A11B msgbox gUnknown_818FDA8 msgbox gUnknown_818FF19, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_16A11B msgbox gUnknown_818FE5C applymovement 2, Movement_WalkInPlaceFastestUp diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 3ecce3880..5dc1f3a67 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -80,9 +80,9 @@ EventScript_16A2A4:: @ 816A2A4 end ViridianCity_Mart_EventScript_16A2AE:: @ 816A2AE - msgbox gUnknown_81902F5, 2 + msgbox gUnknown_81902F5, MSGBOX_NPC end ViridianCity_Mart_EventScript_16A2B7:: @ 816A2B7 - msgbox gUnknown_819032C, 2 + msgbox gUnknown_819032C, MSGBOX_NPC end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index 6c24a177b..4a09cff1e 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -15,13 +15,13 @@ ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF end ViridianCity_PokemonCenter_1F_EventScript_16A2D8:: @ 816A2D8 - msgbox gUnknown_81903E5, 2 + msgbox gUnknown_81903E5, MSGBOX_NPC end ViridianCity_PokemonCenter_1F_EventScript_16A2E1:: @ 816A2E1 - msgbox gUnknown_8190384, 2 + msgbox gUnknown_8190384, MSGBOX_NPC end ViridianCity_PokemonCenter_1F_EventScript_16A2EA:: @ 816A2EA - msgbox gUnknown_8190450, 2 + msgbox gUnknown_8190450, MSGBOX_NPC end diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index 95b1f0fb5..6fb97d075 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -7,58 +7,58 @@ ViridianForest_OnTransition:: @ 8160525 end ViridianForest_EventScript_160529:: @ 8160529 - msgbox gUnknown_8172255, 2 + msgbox gUnknown_8172255, MSGBOX_NPC end ViridianForest_EventScript_160532:: @ 8160532 - msgbox gUnknown_8172559, 2 + msgbox gUnknown_8172559, MSGBOX_NPC end ViridianForest_EventScript_16053B:: @ 816053B - msgbox gUnknown_81725C7, 3 + msgbox gUnknown_81725C7, MSGBOX_SIGN end ViridianForest_EventScript_160544:: @ 8160544 - msgbox gUnknown_8172629, 3 + msgbox gUnknown_8172629, MSGBOX_SIGN end ViridianForest_EventScript_16054D:: @ 816054D - msgbox gUnknown_817265C, 3 + msgbox gUnknown_817265C, MSGBOX_SIGN end ViridianForest_EventScript_160556:: @ 8160556 - msgbox gUnknown_81726A3, 3 + msgbox gUnknown_81726A3, MSGBOX_SIGN end ViridianForest_EventScript_16055F:: @ 816055F - msgbox gUnknown_817271D, 3 + msgbox gUnknown_817271D, MSGBOX_SIGN end ViridianForest_EventScript_160568:: @ 8160568 - msgbox gUnknown_8172773, 3 + msgbox gUnknown_8172773, MSGBOX_SIGN end ViridianForest_EventScript_160571:: @ 8160571 trainerbattle_single TRAINER_BUG_CATCHER_RICK, Text_1722C7, Text_1722F9 - msgbox gUnknown_8172315, 6 + msgbox gUnknown_8172315, MSGBOX_AUTOCLOSE end ViridianForest_EventScript_160588:: @ 8160588 trainerbattle_single TRAINER_BUG_CATCHER_DOUG, Text_17234A, Text_17237D - msgbox gUnknown_8172398, 6 + msgbox gUnknown_8172398, MSGBOX_AUTOCLOSE end ViridianForest_EventScript_16059F:: @ 816059F trainerbattle_single TRAINER_BUG_CATCHER_SAMMY, Text_1723D4, Text_172402 - msgbox gUnknown_817241F, 6 + msgbox gUnknown_817241F, MSGBOX_AUTOCLOSE end ViridianForest_EventScript_1605B6:: @ 81605B6 trainerbattle_single TRAINER_BUG_CATCHER_ANTHONY, Text_172482, Text_1724BF - msgbox gUnknown_81724DC, 6 + msgbox gUnknown_81724DC, MSGBOX_AUTOCLOSE end ViridianForest_EventScript_1605CD:: @ 81605CD trainerbattle_single TRAINER_BUG_CATCHER_CHARLIE, Text_1724F9, Text_17251B - msgbox gUnknown_8172527, 6 + msgbox gUnknown_8172527, MSGBOX_AUTOCLOSE end diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index bac14d221..c089472cb 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -8,8 +8,8 @@ Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 specialvar VAR_RESULT, IsThereMonInRoute5Daycare compare VAR_RESULT, 1 goto_if_eq EventScript_1BF46E - msgbox Text_19DD66, 5 - compare VAR_RESULT, 1 + msgbox Text_19DD66, MSGBOX_YESNO + compare VAR_RESULT, YES goto_if_eq EventScript_1BF3DD msgbox Text_19DDB2 goto EventScript_1BF541 @@ -64,8 +64,8 @@ EventScript_1BF46E:: @ 81BF46E compare VAR_RESULT, 0 call_if_eq EventScript_1BF4B3 special GetCostToWithdrawRoute5DaycareMon - msgbox Text_19DE80, 5 - compare VAR_RESULT, 1 + msgbox Text_19DE80, MSGBOX_YESNO + compare VAR_RESULT, YES goto_if_eq EventScript_1BF4BC goto EventScript_1BF444 end diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc index 3d808fa86..e1e0beebb 100644 --- a/data/scripts/field_moves.inc +++ b/data/scripts/field_moves.inc @@ -10,8 +10,8 @@ EventScript_InteractWithCutTreeObject:: @ 81BDF13 setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_CUT - msgbox gUnknown_81BDF94, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BDF94, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BDF91 msgbox gUnknown_81BDFD7 closemessage @@ -39,7 +39,7 @@ Movement_1BDF85:: @ 81BDF85 step_end EventScript_1BDF87:: @ 81BDF87 - msgbox gUnknown_81BDFE3, 3 + msgbox gUnknown_81BDFE3, MSGBOX_SIGN releaseall end @@ -72,8 +72,8 @@ EventScript_InteractWithRockSmashRockObject:: @ 81BE00C setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_ROCK_SMASH - msgbox Text_1BE09D, 5 - compare VAR_RESULT, 0 + msgbox Text_1BE09D, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE09A msgbox gUnknown_81BDFD7 closemessage @@ -109,7 +109,7 @@ Movement_1BE08F:: @ 81BE08F step_end EventScript_1BE091:: @ 81BE091 - msgbox gUnknown_81BE0E2, 3 + msgbox gUnknown_81BE0E2, MSGBOX_SIGN end EventScript_1BE09A:: @ 81BE09A @@ -136,8 +136,8 @@ EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_1BE185 setfieldeffectarg 0, VAR_RESULT - msgbox gUnknown_81BE19A, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BE19A, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE197 closemessage dofieldeffect FLDEFF_USE_STRENGTH @@ -154,15 +154,15 @@ EventScript_FldEffStrength:: @ 81BE16E EventScript_1BE179:: @ 81BE179 setflag FLAG_SYS_STRENGTH_ACTIVE - msgbox gUnknown_81BE1FA, 3 + msgbox gUnknown_81BE1FA, MSGBOX_SIGN end EventScript_1BE185:: @ 81BE185 - msgbox gUnknown_81BE244, 3 + msgbox gUnknown_81BE244, MSGBOX_SIGN end EventScript_1BE18E:: @ 81BE18E - msgbox gUnknown_81BE284, 3 + msgbox gUnknown_81BE284, MSGBOX_SIGN end EventScript_1BE197:: @ 81BE197 @@ -198,8 +198,8 @@ gUnknown_81BE2B7:: @ 81BE2B7 goto_if_eq EventScript_1BE300 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT - msgbox gUnknown_81BE33F, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BE33F, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE308 msgbox gUnknown_81BE378 dofieldeffect FLDEFF_USE_WATERFALL @@ -233,8 +233,8 @@ EventScript_1BE38B:: @ 81BE38B getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 - msgbox gUnknown_81BE469, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BE469, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE3D2 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE @@ -256,8 +256,8 @@ EventScript_1BE3D4:: @ 81BE3D4 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 - msgbox gUnknown_81BE4EF, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BE4EF, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE429 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE @@ -299,7 +299,7 @@ gUnknown_81BE52F:: @ 81BE52F .string "DIVE can't be used here.$" EventScript_FailSweetScent:: @ 81BE564 - msgbox Text_1BE56D, 3 + msgbox Text_1BE56D, MSGBOX_SIGN end Text_1BE56D:: @ 81BE56D diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc index 782c71a92..edc11e317 100644 --- a/data/scripts/surf.inc +++ b/data/scripts/surf.inc @@ -8,8 +8,8 @@ EventScript_UseSurf:: @ 81A6AC8 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT lockall - msgbox Text_1A556E, 5 - compare VAR_RESULT, 0 + msgbox Text_1A556E, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_UseSurfRelease msgbox Text_1A55A5 dofieldeffect FLDEFF_USE_SURF |