diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/cable_club.inc | 6 | ||||
| -rw-r--r-- | data/scripts/contest_hall.inc | 68 | ||||
| -rw-r--r-- | data/scripts/day_care.inc | 50 | ||||
| -rw-r--r-- | data/scripts/gabby_and_ty.inc | 34 | ||||
| -rw-r--r-- | data/scripts/magma_chimney.inc | 24 | ||||
| -rw-r--r-- | data/scripts/magma_summit.inc | 12 | ||||
| -rw-r--r-- | data/scripts/mauville_man.inc | 54 | ||||
| -rw-r--r-- | data/scripts/mystery_event_club.inc | 26 | ||||
| -rw-r--r-- | data/scripts/players_house.inc | 54 | ||||
| -rw-r--r-- | data/scripts/pokeblocks.inc | 48 | ||||
| -rw-r--r-- | data/scripts/secret_power_tm.inc | 6 | ||||
| -rw-r--r-- | data/scripts/tv.inc | 10 |
12 files changed, 196 insertions, 196 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 56a03f346..365992fb3 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -554,15 +554,15 @@ OldaleTown_PokemonCenter_2F_EventScript_1A432D:: @ 81A432D end OldaleTown_PokemonCenter_2F_EventScript_1A4339:: @ 81A4339 - msgbox OldaleTown_PokemonCenter_2F_Text_1A141C, 2 + msgbox OldaleTown_PokemonCenter_2F_Text_1A141C, MSGBOX_NPC end OldaleTown_PokemonCenter_2F_EventScript_1A4342:: @ 81A4342 - msgbox OldaleTown_PokemonCenter_2F_Text_1A13DF, 2 + msgbox OldaleTown_PokemonCenter_2F_Text_1A13DF, MSGBOX_NPC end OldaleTown_PokemonCenter_2F_EventScript_1A434B:: @ 81A434B - msgbox OldaleTown_PokemonCenter_2F_Text_1A145C, 2 + msgbox OldaleTown_PokemonCenter_2F_Text_1A145C, MSGBOX_NPC end OldaleTown_PokemonCenter_2F_Movement_1A4354:: @ 81A4354 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 2f5634b8e..9053e3c59 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -11,7 +11,7 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 goto_if_ne FallarborTown_ContestLobby_EventScript_1A4F4E goto_if_set FLAG_TEMP_1, FallarborTown_ContestLobby_EventScript_1A4F8F bufferstdstring 0, VAR_0x800B - msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 + msgbox FallarborTown_ContestLobby_Text_1A5DFC, MSGBOX_DEFAULT checkitem ITEM_CONTEST_PASS, 1 compare VAR_RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EE1 @@ -26,7 +26,7 @@ FallarborTown_ContestLobby_EventScript_1A4EDD:: @ 81A4EDD FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 compare VAR_CONTEST_RANK, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EF6 - msgbox FallarborTown_ContestLobby_Text_1A6340, 4 + msgbox FallarborTown_ContestLobby_Text_1A6340, MSGBOX_DEFAULT releaseall end @@ -34,27 +34,27 @@ FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6 msgbox FallarborTown_ContestLobby_Text_1A64F4, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F13 - msgbox FallarborTown_ContestLobby_Text_1A65EA, 4 + msgbox FallarborTown_ContestLobby_Text_1A65EA, MSGBOX_DEFAULT releaseall end FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13 goto_if_set FLAG_RECEIVED_CONTEST_PASS, FallarborTown_ContestLobby_EventScript_1A4F44 - msgbox FallarborTown_ContestLobby_Text_1A6583, 4 + msgbox FallarborTown_ContestLobby_Text_1A6583, MSGBOX_DEFAULT giveitem ITEM_CONTEST_PASS setflag FLAG_RECEIVED_CONTEST_PASS setflag FLAG_TEMP_1 - msgbox FallarborTown_ContestLobby_Text_1A5E98, 4 + msgbox FallarborTown_ContestLobby_Text_1A5E98, MSGBOX_DEFAULT goto FallarborTown_ContestLobby_EventScript_1A4F8F end FallarborTown_ContestLobby_EventScript_1A4F44:: @ 81A4F44 - msgbox FallarborTown_ContestLobby_Text_1A6590, 4 + msgbox FallarborTown_ContestLobby_Text_1A6590, MSGBOX_DEFAULT releaseall end FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E - msgbox FallarborTown_ContestLobby_Text_1A685A, 4 + msgbox FallarborTown_ContestLobby_Text_1A685A, MSGBOX_DEFAULT switch VAR_CONTEST_PRIZE_PICKUP case 4, FallarborTown_ContestLobby_EventScript_1A4F67 end @@ -69,7 +69,7 @@ FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67 end FallarborTown_ContestLobby_EventScript_1A4F86:: @ 81A4F86 - msgbox FallarborTown_ContestLobby_Text_1A68C6, 2 + msgbox FallarborTown_ContestLobby_Text_1A68C6, MSGBOX_NPC end FallarborTown_ContestLobby_EventScript_1A4F8F:: @ 81A4F8F @@ -96,27 +96,27 @@ FallarborTown_ContestLobby_EventScript_1A4FCC:: @ 81A4FCC end FallarborTown_ContestLobby_EventScript_1A5014:: @ 81A5014 - msgbox FallarborTown_ContestLobby_Text_1A5E98, 4 + msgbox FallarborTown_ContestLobby_Text_1A5E98, MSGBOX_DEFAULT goto FallarborTown_ContestLobby_EventScript_1A4FCC end FallarborTown_ContestLobby_EventScript_1A5022:: @ 81A5022 - msgbox FallarborTown_ContestLobby_Text_1A609B, 4 + msgbox FallarborTown_ContestLobby_Text_1A609B, MSGBOX_DEFAULT goto FallarborTown_ContestLobby_EventScript_1A4FCC end FallarborTown_ContestLobby_EventScript_1A5030:: @ 81A5030 - msgbox FallarborTown_ContestLobby_Text_1A613F, 4 + msgbox FallarborTown_ContestLobby_Text_1A613F, MSGBOX_DEFAULT goto FallarborTown_ContestLobby_EventScript_1A4FCC end FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E - msgbox FallarborTown_ContestLobby_Text_188559, 4 + msgbox FallarborTown_ContestLobby_Text_188559, MSGBOX_DEFAULT release end FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 - msgbox FallarborTown_ContestLobby_Text_1A6319, 4 + msgbox FallarborTown_ContestLobby_Text_1A6319, MSGBOX_DEFAULT choosecontestmon compare VAR_0x8004, 255 goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097 @@ -145,7 +145,7 @@ FallarborTown_ContestLobby_EventScript_1A5097:: @ 81A5097 end FallarborTown_ContestLobby_EventScript_1A50C8:: @ 81A50C8 - msgbox FallarborTown_ContestLobby_Text_1A664A, 4 + msgbox FallarborTown_ContestLobby_Text_1A664A, MSGBOX_DEFAULT goto FallarborTown_ContestLobby_EventScript_1A5048 release end @@ -165,19 +165,19 @@ FallarborTown_ContestLobby_EventScript_1A50FB:: @ 81A50FB end FallarborTown_ContestLobby_EventScript_1A511F:: @ 81A511F - msgbox FallarborTown_ContestLobby_Text_1A669F, 4 + msgbox FallarborTown_ContestLobby_Text_1A669F, MSGBOX_DEFAULT goto FallarborTown_ContestLobby_EventScript_1A5048 release end FallarborTown_ContestLobby_EventScript_1A512E:: @ 81A512E - msgbox FallarborTown_ContestLobby_Text_1A66DC, 4 + msgbox FallarborTown_ContestLobby_Text_1A66DC, MSGBOX_DEFAULT goto FallarborTown_ContestLobby_EventScript_1A5048 release end FallarborTown_ContestLobby_EventScript_1A513D:: @ 81A513D - msgbox FallarborTown_ContestLobby_Text_1A67C1, 4 + msgbox FallarborTown_ContestLobby_Text_1A67C1, MSGBOX_DEFAULT closemessage releaseall setvar VAR_LINK_CONTEST_ROOM_STATE, 1 @@ -270,7 +270,7 @@ LinkContestRoom1_EventScript_1A5245:: @ 81A5245 LinkContestRoom1_EventScript_1A525F:: @ 81A525F compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5273 - msgbox LinkContestRoom1_Text_1A68F0, 3 + msgbox LinkContestRoom1_Text_1A68F0, MSGBOX_SIGN return LinkContestRoom1_EventScript_1A5273:: @ 81A5273 @@ -385,7 +385,7 @@ LinkContestRoom1_EventScript_1A5377:: @ 81A5377 LinkContestRoom1_EventScript_1A53B3:: @ 81A53B3 compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A53C7 - msgbox LinkContestRoom1_Text_1A6A1F, 4 + msgbox LinkContestRoom1_Text_1A6A1F, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_1A53C7:: @ 81A53C7 @@ -782,7 +782,7 @@ LinkContestRoom1_EventScript_1A58EE:: @ 81A58EE LinkContestRoom1_EventScript_1A5930:: @ 81A5930 compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5944 - msgbox LinkContestRoom1_Text_1A6AF5, 3 + msgbox LinkContestRoom1_Text_1A6AF5, MSGBOX_SIGN return LinkContestRoom1_EventScript_1A5944:: @ 81A5944 @@ -809,7 +809,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A LinkContestRoom1_EventScript_1A5984:: @ 81A5984 compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5998 - msgbox LinkContestRoom1_Text_1A6C06, 4 + msgbox LinkContestRoom1_Text_1A6C06, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_1A5998:: @ 81A5998 @@ -821,7 +821,7 @@ LinkContestRoom1_EventScript_1A5998:: @ 81A5998 LinkContestRoom1_EventScript_1A59A2:: @ 81A59A2 compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A59B6 - msgbox LinkContestRoom1_Text_1A6C21, 4 + msgbox LinkContestRoom1_Text_1A6C21, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_1A59B6:: @ 81A59B6 @@ -833,7 +833,7 @@ LinkContestRoom1_EventScript_1A59B6:: @ 81A59B6 LinkContestRoom1_EventScript_1A59C0:: @ 81A59C0 compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A59D4 - msgbox LinkContestRoom1_Text_1A6C9D, 4 + msgbox LinkContestRoom1_Text_1A6C9D, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_1A59D4:: @ 81A59D4 @@ -845,7 +845,7 @@ LinkContestRoom1_EventScript_1A59D4:: @ 81A59D4 LinkContestRoom1_EventScript_1A59DE:: @ 81A59DE compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A59F2 - msgbox LinkContestRoom1_Text_1A6D16, 4 + msgbox LinkContestRoom1_Text_1A6D16, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2 @@ -895,7 +895,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 LinkContestRoom1_EventScript_1A5A75:: @ 81A5A75 compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5A89 - msgbox LinkContestRoom1_Text_1A6D3C, 4 + msgbox LinkContestRoom1_Text_1A6D3C, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_1A5A89:: @ 81A5A89 @@ -995,7 +995,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB goto_if_eq LinkContestRoom1_EventScript_1A5C4C call LinkContestRoom1_EventScript_1A5C12 goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_1A5BF6 - msgbox LinkContestRoom1_Text_1A6DC5, 3 + msgbox LinkContestRoom1_Text_1A6DC5, MSGBOX_SIGN waitmessage call LinkContestRoom1_EventScript_1A5C7F call LinkContestRoom1_EventScript_1A5CE5 @@ -1010,7 +1010,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6 incrementgamestat GAME_STAT_WON_CONTEST - msgbox LinkContestRoom1_Text_1A6DF1, 3 + msgbox LinkContestRoom1_Text_1A6DF1, MSGBOX_SIGN delay 90 special sub_80C4CF8 compare VAR_0x8004, 1 @@ -1110,7 +1110,7 @@ LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 special ScrSpecial_GetContestWinnerIdx compare VAR_0x8005, 3 goto_if_eq LinkContestRoom1_EventScript_1A5CFC - msgbox LinkContestRoom1_Text_1A6DF1, 3 + msgbox LinkContestRoom1_Text_1A6DF1, MSGBOX_SIGN return LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC @@ -1122,11 +1122,11 @@ LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC goto_if_eq LinkContestRoom1_EventScript_1A5D5B compare VAR_CONTEST_RANK, 3 goto_if_eq LinkContestRoom1_EventScript_1A5D3B - msgbox LinkContestRoom1_Text_1A6DF1, 3 + msgbox LinkContestRoom1_Text_1A6DF1, MSGBOX_SIGN return LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D - msgbox LinkContestRoom1_Text_1A6E1F, 3 + msgbox LinkContestRoom1_Text_1A6E1F, MSGBOX_SIGN setvar VAR_CONTEST_PRIZE_PICKUP, 4 return @@ -1134,7 +1134,7 @@ LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B giveitem ITEM_LUXURY_BALL compare VAR_RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D2D - msgbox LinkContestRoom1_Text_1A6DF1, 3 + msgbox LinkContestRoom1_Text_1A6DF1, MSGBOX_SIGN return LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B @@ -1142,12 +1142,12 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B incrementgamestat GAME_STAT_RECEIVED_RIBBONS setflag FLAG_SYS_RIBBON_GET lockall - msgbox LinkContestRoom1_Text_1A6D6A, 4 + msgbox LinkContestRoom1_Text_1A6D6A, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - msgbox LinkContestRoom1_Text_1A6D96, 4 + msgbox LinkContestRoom1_Text_1A6D96, MSGBOX_DEFAULT waitfanfare special ScrSpecial_GetContestWinnerNick - msgbox LinkContestRoom1_Text_1A6DAC, 4 + msgbox LinkContestRoom1_Text_1A6DAC, MSGBOX_DEFAULT releaseall return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 1a7e56cfd..c60ec488d 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -9,7 +9,7 @@ Route117_EventScript_1B222D:: @ 81B222D goto_if_eq Route117_EventScript_1B22E7 compare VAR_RESULT, 3 goto_if_eq Route117_EventScript_1B22FE - msgbox Route117_Text_1B25CB, 4 + msgbox Route117_Text_1B25CB, MSGBOX_DEFAULT release end @@ -20,7 +20,7 @@ Route117_EventScript_1B2262:: @ 81B2262 msgbox Route117_Text_1B28C4, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq Route117_EventScript_1B2298 - msgbox Route117_Text_1B2745, 4 + msgbox Route117_Text_1B2745, MSGBOX_DEFAULT clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare release @@ -30,7 +30,7 @@ Route117_EventScript_1B2298:: @ 81B2298 specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 6 goto_if_ne Route117_EventScript_1B22B2 - msgbox Route117_Text_1B2766, 4 + msgbox Route117_Text_1B2766, MSGBOX_DEFAULT release end @@ -40,7 +40,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 waitfanfare waitmessage waitbuttonpress - msgbox Route117_Text_1B27CD, 4 + msgbox Route117_Text_1B27CD, MSGBOX_DEFAULT special GiveEggFromDaycare clearflag FLAG_PENDING_DAYCARE_EGG release @@ -53,12 +53,12 @@ Route117_EventScript_1B22CD:: @ 81B22CD return Route117_EventScript_1B22DE:: @ 81B22DE - msgbox Route117_Text_1B27E3, 4 + msgbox Route117_Text_1B27E3, MSGBOX_DEFAULT return Route117_EventScript_1B22E7:: @ 81B22E7 special GetDaycareMonNicknames - msgbox Route117_Text_1B2710, 4 + msgbox Route117_Text_1B2710, MSGBOX_DEFAULT setvar VAR_0x8004, 0 call Route117_EventScript_1B22CD release @@ -66,7 +66,7 @@ Route117_EventScript_1B22E7:: @ 81B22E7 Route117_EventScript_1B22FE:: @ 81B22FE special GetDaycareMonNicknames - msgbox Route117_Text_1B2897, 4 + msgbox Route117_Text_1B2897, MSGBOX_DEFAULT special SetDaycareCompatibilityString special ShowFieldMessageStringVar4 waitmessage @@ -91,7 +91,7 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 msgbox Route117_PokemonDayCare_Text_1B28F2, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B236C - msgbox Route117_PokemonDayCare_Text_1B2A14, 4 + msgbox Route117_PokemonDayCare_Text_1B2A14, MSGBOX_DEFAULT release end @@ -99,7 +99,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C specialvar VAR_RESULT, GetNumValidDaycarePartyMons compare VAR_RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3 - msgbox Route117_PokemonDayCare_Text_1B2947, 4 + msgbox Route117_PokemonDayCare_Text_1B2947, MSGBOX_DEFAULT fadescreen 1 special ChooseSendDaycareMon waitstate @@ -111,7 +111,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C specialvar VAR_0x8005, GetSelectedDaycareMonNickname waitse playmoncry VAR_0x8005, 0 - msgbox Route117_PokemonDayCare_Text_1B296E, 4 + msgbox Route117_PokemonDayCare_Text_1B296E, MSGBOX_DEFAULT waitmoncry special StoreSelectedPokemonInDaycare incrementgamestat GAME_STAT_USED_DAYCARE @@ -122,7 +122,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C end Route117_PokemonDayCare_EventScript_1B23D0:: @ 81B23D0 - msgbox Route117_PokemonDayCare_Text_1B2A76, 4 + msgbox Route117_PokemonDayCare_Text_1B2A76, MSGBOX_DEFAULT release end @@ -134,22 +134,22 @@ Route117_PokemonDayCare_EventScript_1B23DA:: @ 81B23DA end Route117_PokemonDayCare_EventScript_1B23F3:: @ 81B23F3 - msgbox Route117_PokemonDayCare_Text_1B2BBB, 4 + msgbox Route117_PokemonDayCare_Text_1B2BBB, MSGBOX_DEFAULT release end Route117_PokemonDayCare_EventScript_1B23FD:: @ 81B23FD - msgbox Route117_PokemonDayCare_Text_1B2C17, 4 + msgbox Route117_PokemonDayCare_Text_1B2C17, MSGBOX_DEFAULT release end Route117_PokemonDayCare_EventScript_1B2407:: @ 81B2407 - msgbox Route117_PokemonDayCare_Text_1B29F4, 4 + msgbox Route117_PokemonDayCare_Text_1B29F4, MSGBOX_DEFAULT release end Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411 - msgbox Route117_PokemonDayCare_Text_1B2ACC, 4 + msgbox Route117_PokemonDayCare_Text_1B2ACC, MSGBOX_DEFAULT return Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A @@ -159,7 +159,7 @@ Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A return Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B - msgbox Route117_PokemonDayCare_Text_1B2A88, 4 + msgbox Route117_PokemonDayCare_Text_1B2A88, MSGBOX_DEFAULT setvar VAR_0x8004, 0 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B29AD, MSGBOX_YESNO @@ -199,7 +199,7 @@ Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 specialvar VAR_RESULT, HasEnoughMoneyFor compare VAR_RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24DE - msgbox Route117_PokemonDayCare_Text_1B2A30, 4 + msgbox Route117_PokemonDayCare_Text_1B2A30, MSGBOX_DEFAULT release end @@ -209,10 +209,10 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE specialvar VAR_RESULT, TakePokemonFromDaycare special PayMoneyFor playse SE_REGI - msgbox Route117_PokemonDayCare_Text_1B2B75, 4 + msgbox Route117_PokemonDayCare_Text_1B2B75, MSGBOX_DEFAULT waitse playmoncry VAR_RESULT, 0 - msgbox Route117_PokemonDayCare_Text_1B2B93, 4 + msgbox Route117_PokemonDayCare_Text_1B2B93, MSGBOX_DEFAULT waitmoncry specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 2 @@ -228,7 +228,7 @@ Route117_PokemonDayCare_EventScript_1B2520:: @ 81B2520 end Route117_PokemonDayCare_EventScript_1B2539:: @ 81B2539 - msgbox Route117_PokemonDayCare_Text_1B2AEF, 4 + msgbox Route117_PokemonDayCare_Text_1B2AEF, MSGBOX_DEFAULT release end @@ -258,7 +258,7 @@ Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543 end Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 - msgbox Route117_PokemonDayCare_Text_1B2A88, 4 + msgbox Route117_PokemonDayCare_Text_1B2A88, MSGBOX_DEFAULT setvar VAR_0x8004, 0 call Route117_PokemonDayCare_EventScript_1B241A setvar VAR_0x8004, 1 @@ -266,7 +266,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 msgbox Route117_PokemonDayCare_Text_1B2BF6, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 - msgbox Route117_PokemonDayCare_Text_1B2A76, 4 + msgbox Route117_PokemonDayCare_Text_1B2A76, MSGBOX_DEFAULT release end @@ -277,14 +277,14 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare - msgbox Route117_PokemonDayCare_Text_1B2B75, 4 - msgbox Route117_PokemonDayCare_Text_1B2A76, 4 + msgbox Route117_PokemonDayCare_Text_1B2B75, MSGBOX_DEFAULT + msgbox Route117_PokemonDayCare_Text_1B2A76, MSGBOX_DEFAULT release end S_EggHatch:: @ 81B25BC lockall - msgbox UnknownString_81B2C68, 4 + msgbox UnknownString_81B2C68, MSGBOX_DEFAULT special EggHatch waitstate releaseall diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index b2d0e598b..b8bc05b3b 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -125,61 +125,61 @@ Route111_EventScript_1AE41E:: @ 81AE41E Route111_EventScript_1AE422:: @ 81AE422 trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2 - msgbox Route111_Text_1AC59E, 4 + msgbox Route111_Text_1AC59E, MSGBOX_DEFAULT release end Route111_EventScript_1AE442:: @ 81AE442 trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2 - msgbox Route111_Text_1AC7E4, 4 + msgbox Route111_Text_1AC7E4, MSGBOX_DEFAULT release end Route118_EventScript_1AE462:: @ 81AE462 trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F - msgbox Route118_Text_1AC59E, 4 + msgbox Route118_Text_1AC59E, MSGBOX_DEFAULT release end Route118_EventScript_1AE482:: @ 81AE482 trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F - msgbox Route118_Text_1AC7E4, 4 + msgbox Route118_Text_1AC7E4, MSGBOX_DEFAULT release end Route120_EventScript_1AE4A2:: @ 81AE4A2 trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F - msgbox Route120_Text_1AC59E, 4 + msgbox Route120_Text_1AC59E, MSGBOX_DEFAULT release end Route120_EventScript_1AE4C2:: @ 81AE4C2 trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F - msgbox Route120_Text_1AC7E4, 4 + msgbox Route120_Text_1AC7E4, MSGBOX_DEFAULT release end Route111_EventScript_1AE4E2:: @ 81AE4E2 trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F - msgbox Route111_Text_1AC59E, 4 + msgbox Route111_Text_1AC59E, MSGBOX_DEFAULT release end Route111_EventScript_1AE502:: @ 81AE502 trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F - msgbox Route111_Text_1AC7E4, 4 + msgbox Route111_Text_1AC7E4, MSGBOX_DEFAULT release end Route118_EventScript_1AE522:: @ 81AE522 trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F - msgbox Route118_Text_1AC59E, 4 + msgbox Route118_Text_1AC59E, MSGBOX_DEFAULT release end Route118_EventScript_1AE542:: @ 81AE542 trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F - msgbox Route118_Text_1AC7E4, 4 + msgbox Route118_Text_1AC7E4, MSGBOX_DEFAULT release end @@ -187,7 +187,7 @@ Route111_EventScript_1AE562:: @ 81AE562 Route118_EventScript_1AE562:: @ 81AE562 Route120_EventScript_1AE562:: @ 81AE562 trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F - msgbox Route111_Text_1AC59E, 4 + msgbox Route111_Text_1AC59E, MSGBOX_DEFAULT release end @@ -195,7 +195,7 @@ Route111_EventScript_1AE582:: @ 81AE582 Route118_EventScript_1AE582:: @ 81AE582 Route120_EventScript_1AE582:: @ 81AE582 trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F - msgbox Route111_Text_1AC7E4, 4 + msgbox Route111_Text_1AC7E4, MSGBOX_DEFAULT release end @@ -245,7 +245,7 @@ Route120_EventScript_1AE60F:: @ 81AE60F specialvar VAR_RESULT, GabbyAndTyGetLastQuote compare VAR_RESULT, 0 goto_if_eq Route111_EventScript_1AE69F - msgbox Route111_Text_1AC10A, 4 + msgbox Route111_Text_1AC10A, MSGBOX_DEFAULT specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia switch VAR_RESULT case 0, Route111_EventScript_1AE6AD @@ -300,26 +300,26 @@ Route111_EventScript_1AE6E5:: @ 81AE6E5 Route111_EventScript_1AE6F3:: @ 81AE6F3 compare VAR_RESULT, NO goto_if_eq Route111_EventScript_1AE72D - msgbox Route111_Text_1AC40F, 4 + msgbox Route111_Text_1AC40F, MSGBOX_DEFAULT setvar VAR_0x8004, 10 call Route111_EventScript_1A00F3 lock faceplayer compare VAR_RESULT, 0 goto_if_eq Route111_EventScript_1AE72D - msgbox Route111_Text_1AC487, 4 + msgbox Route111_Text_1AC487, MSGBOX_DEFAULT special GabbyAndTyAfterInterview setflag FLAG_TEMP_1 release end Route111_EventScript_1AE72D:: @ 81AE72D - msgbox Route111_Text_1AC553, 4 + msgbox Route111_Text_1AC553, MSGBOX_DEFAULT setflag FLAG_TEMP_1 release end Route111_EventScript_1AE73A:: @ 81AE73A - msgbox Route111_Text_1AC59E, 4 + msgbox Route111_Text_1AC59E, MSGBOX_DEFAULT release end diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 92a4c055a..11837cbc6 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -12,26 +12,26 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95 MtChimney_EventScript_1B2CB9:: @ 81B2CB9 .ifdef SAPPHIRE - msgbox MtChimney_Text_1B350B, 4 + msgbox MtChimney_Text_1B350B, MSGBOX_DEFAULT .else - msgbox MtChimney_Text_1B3EC1, 4 + msgbox MtChimney_Text_1B3EC1, MSGBOX_DEFAULT .endif return MtChimney_EventScript_1B2CC2:: @ 81B2CC2 .ifdef SAPPHIRE - msgbox MtChimney_Text_1B3598, 4 + msgbox MtChimney_Text_1B3598, MSGBOX_DEFAULT .else - msgbox MtChimney_Text_1B3F8C, 4 + msgbox MtChimney_Text_1B3F8C, MSGBOX_DEFAULT .endif return MtChimney_EventScript_1B2CCB:: @ 81B2CCB lockall .ifdef SAPPHIRE - msgbox MtChimney_Text_1B2DEE, 4 + msgbox MtChimney_Text_1B2DEE, MSGBOX_DEFAULT .else - msgbox MtChimney_Text_1B37BB, 4 + msgbox MtChimney_Text_1B37BB, MSGBOX_DEFAULT .endif applymovement 2, MtChimney_Movement_1A0839 waitmovement 0 @@ -41,9 +41,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB applymovement 2, MtChimney_Movement_1A0835 waitmovement 0 .ifdef SAPPHIRE - msgbox MtChimney_Text_1B2ED9, 4 + msgbox MtChimney_Text_1B2ED9, MSGBOX_DEFAULT .else - msgbox MtChimney_Text_1B38B3, 4 + msgbox MtChimney_Text_1B38B3, MSGBOX_DEFAULT .endif .ifdef SAPPHIRE trainerbattle_no_intro TRAINER_MT_CHIMNEY_GRUNT_3, MtChimney_Text_1B3099 @@ -51,9 +51,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB trainerbattle_no_intro TRAINER_MT_CHIMNEY_GRUNT_3, MtChimney_Text_1B3A68 .endif .ifdef SAPPHIRE - msgbox MtChimney_Text_1B30C2, 4 + msgbox MtChimney_Text_1B30C2, MSGBOX_DEFAULT .else - msgbox MtChimney_Text_1B3A90, 4 + msgbox MtChimney_Text_1B3A90, MSGBOX_DEFAULT .endif closemessage delay 30 @@ -72,9 +72,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB applymovement 255, MtChimney_Movement_1A083F waitmovement 0 .ifdef SAPPHIRE - msgbox MtChimney_Text_1B3608, 4 + msgbox MtChimney_Text_1B3608, MSGBOX_DEFAULT .else - msgbox MtChimney_Text_1B3FFE, 4 + msgbox MtChimney_Text_1B3FFE, MSGBOX_DEFAULT .endif closemessage compare VAR_FACING, 4 diff --git a/data/scripts/magma_summit.inc b/data/scripts/magma_summit.inc index 766b1625e..403bf2e37 100644 --- a/data/scripts/magma_summit.inc +++ b/data/scripts/magma_summit.inc @@ -1,29 +1,29 @@ MtPyre_Summit_EventScript_1B2DA9:: @ 81B2DA9 .ifdef SAPPHIRE trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_1, UnknownString_81B50C3, UnknownString_81B50F5 - msgbox UnknownString_81B5131, 6 + msgbox UnknownString_81B5131, MSGBOX_AUTOCLOSE .else trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_1, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 - msgbox MtPyre_Summit_Text_1B5D6D, 6 + msgbox MtPyre_Summit_Text_1B5D6D, MSGBOX_AUTOCLOSE .endif end MtPyre_Summit_EventScript_1B2DC0:: @ 81B2DC0 .ifdef SAPPHIRE trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_2, UnknownString_81B5166, UnknownString_81B519F - msgbox UnknownString_81B51B5, 6 + msgbox UnknownString_81B51B5, MSGBOX_AUTOCLOSE .else trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_2, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB - msgbox MtPyre_Summit_Text_1B5DF1, 6 + msgbox MtPyre_Summit_Text_1B5DF1, MSGBOX_AUTOCLOSE .endif end MtPyre_Summit_EventScript_1B2DD7:: @ 81B2DD7 .ifdef SAPPHIRE trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_3, UnknownString_81B51EB, UnknownString_81B5224 - msgbox UnknownString_81B5248, 6 + msgbox UnknownString_81B5248, MSGBOX_AUTOCLOSE .else trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_3, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 - msgbox MtPyre_Summit_Text_1B5E84, 6 + msgbox MtPyre_Summit_Text_1B5E84, MSGBOX_AUTOCLOSE .endif end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 9e2db94a1..cadab787d 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -34,12 +34,12 @@ yes_hear_song: compare VAR_RESULT, FALSE @ Prompt new lyrics only if song hasn't been changed goto_if_eq prompt_write_lyrics - msgbox gTextBard_OhWhatAMovingSong, 4 + msgbox gTextBard_OhWhatAMovingSong, MSGBOX_DEFAULT release end dont_hear_song: - msgbox gTextBard_OhYouveLeftMe, 4 + msgbox gTextBard_OhYouveLeftMe, MSGBOX_DEFAULT release end @@ -58,7 +58,7 @@ write_lyrics: faceplayer compare VAR_RESULT, NO goto_if_eq dont_write_lyrics - msgbox gTextBard_ThankYouKindly, 4 + msgbox gTextBard_ThankYouKindly, MSGBOX_DEFAULT setvar VAR_0x8004, 1 @ Give the player ear rape again special ScrSpecial_PlayBardSong @@ -67,12 +67,12 @@ write_lyrics: compare VAR_RESULT, NO goto_if_eq write_lyrics @ Keep looping until player responds YES special ScrSpecial_SaveBardSongLyrics - msgbox gTextBard_OkayThatsIt, 4 + msgbox gTextBard_OkayThatsIt, MSGBOX_DEFAULT release end dont_write_lyrics: - msgbox gTextBard_OhYouveLeftMe2, 4 + msgbox gTextBard_OhYouveLeftMe2, MSGBOX_DEFAULT release end @@ -85,11 +85,11 @@ SpeakToHipster: lock faceplayer setflag FLAG_SYS_HIPSTER_MEET - msgbox gTextHipster_TheyCallMeTheHipster, 4 + msgbox gTextHipster_TheyCallMeTheHipster, MSGBOX_DEFAULT special ScrSpecial_GetHipsterSpokenFlag compare VAR_RESULT, FALSE goto_if_eq hipster_first_time - msgbox gTextHipster_TaughtYouAlready, 4 + msgbox gTextHipster_TaughtYouAlready, MSGBOX_DEFAULT release end @@ -97,12 +97,12 @@ hipster_first_time: special ScrSpecial_HipsterTeachWord compare VAR_RESULT, TRUE @ TRUE if player learned a new word goto_if_eq teach_new_word - msgbox gTextHipster_YouAlreadyKnowALot, 4 + msgbox gTextHipster_YouAlreadyKnowALot, MSGBOX_DEFAULT release end teach_new_word: - msgbox gTextHipster_HaveYouHeardAbout, 4 + msgbox gTextHipster_HaveYouHeardAbout, MSGBOX_DEFAULT special ScrSpecial_SetHipsterSpokenFlag release end @@ -129,11 +129,11 @@ SpeakToTrader: end dont_want_to_trade: - msgbox gTextTrader_FeelUnwanted1, 2 + msgbox gTextTrader_FeelUnwanted1, MSGBOX_NPC end already_traded: - msgbox gTextTrader_TradedAlready, 2 + msgbox gTextTrader_TradedAlready, MSGBOX_NPC end do_trader_menu_get: @@ -153,7 +153,7 @@ do_trader_menu_get: end cancelled_get_menu: - msgbox gTextTrader_DontWantAnything, 2 + msgbox gTextTrader_DontWantAnything, MSGBOX_NPC end rare_item_cant_trade_away: @@ -169,11 +169,11 @@ dont_want_item: end player_has_no_decorations: - msgbox gTextTrader_YouDontHaveDecorations, 2 + msgbox gTextTrader_YouDontHaveDecorations, MSGBOX_NPC end do_trader_menu_give: - msgbox gTextTrader_PickDecorationYoullTrade, 4 + msgbox gTextTrader_PickDecorationYoullTrade, MSGBOX_DEFAULT special ScrSpecial_TraderMenuGiveDecoration waitstate compare VAR_0x8006, 0 @@ -187,20 +187,20 @@ do_trader_menu_give: compare VAR_RESULT, NO goto_if_eq do_trader_menu_give special ScrSpecial_TraderDoDecorationTrade - msgbox gTextTrader_ThenWellTrade, 2 + msgbox gTextTrader_ThenWellTrade, MSGBOX_NPC end cancelled_give_menu: - msgbox gTextTrader_FeelUnwanted2, 2 + msgbox gTextTrader_FeelUnwanted2, MSGBOX_NPC end decoration_is_in_use: - msgbox gTextTrader_InUseYouCantTradeIt, 4 + msgbox gTextTrader_InUseYouCantTradeIt, MSGBOX_DEFAULT goto do_trader_menu_give end decorations_full: - msgbox gTextTrader_NoRoomForThis, 2 + msgbox gTextTrader_NoRoomForThis, MSGBOX_NPC end @@ -243,7 +243,7 @@ cancel_story_menu: goto_if_eq dont_hear_story goto yes_hear_story no_stat_update: - msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4 + msgbox gTextStoryteller_CouldThereBeOtherTrainers, MSGBOX_DEFAULT msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq choose_story @@ -256,7 +256,7 @@ yes_hear_story: goto_if_eq cant_record_story @ story list is full goto prompt_record_story no_stories_recorded: - msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4 + msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, MSGBOX_DEFAULT prompt_record_story: msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO compare VAR_RESULT, NO @@ -264,25 +264,25 @@ prompt_record_story: specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat compare VAR_RESULT, TRUE goto_if_eq stat_update - msgbox gTextStoryteller_ImNotSatisfied, 4 + msgbox gTextStoryteller_ImNotSatisfied, MSGBOX_DEFAULT closemessage release end stat_update: - msgbox gTextStoryteller_BirthOfANewLegend, 4 + msgbox gTextStoryteller_BirthOfANewLegend, MSGBOX_DEFAULT closemessage release end dont_hear_story: - msgbox gTextStoryteller_OhIFeelStifled, 4 + msgbox gTextStoryteller_OhIFeelStifled, MSGBOX_DEFAULT closemessage release end cant_record_story: - msgbox gTextStoryteller_WishMorePeopleWould, 4 + msgbox gTextStoryteller_WishMorePeopleWould, MSGBOX_DEFAULT closemessage release end @@ -321,7 +321,7 @@ tell_another_giddy_tale: end also_i_was_thinking: - msgbox gTextGiddy_AlsoIWasThinking, 4 + msgbox gTextGiddy_AlsoIWasThinking, MSGBOX_DEFAULT goto tell_giddy_tale end @@ -337,12 +337,12 @@ tell_giddy_tale: end dont_hear_giddy: - msgbox gTextGiddy_YouveDeflatedMe, 4 + msgbox gTextGiddy_YouveDeflatedMe, MSGBOX_DEFAULT release end bye_bye: - msgbox gTextGiddy_ByeBye, 4 + msgbox gTextGiddy_ByeBye, MSGBOX_DEFAULT release end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 34c546a39..2aef98d27 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -2,12 +2,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14 lock faceplayer goto_if_set FLAG_SYS_CHAT_USED, PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB - msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, MSGBOX_DEFAULT goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D end PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D:: @ 81B1B2D - msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D10, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D10, MSGBOX_DEFAULT multichoice 17, 6, 20, 0 switch VAR_RESULT case 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A @@ -17,12 +17,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D:: @ 81B1B2D end PetalburgCity_PokemonCenter_1F_EventScript_1B1B6C:: @ 81B1B6C - msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D3A, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D3A, MSGBOX_DEFAULT goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D end PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A - msgbox PetalburgCity_PokemonCenter_1F_Text_1B1F7B, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_1B1F7B, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 0 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 @@ -37,7 +37,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A end PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1:: @ 81B1BB1 - msgbox PetalburgCity_PokemonCenter_1F_Text_1B1FF0, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_1B1FF0, MSGBOX_DEFAULT release end @@ -46,22 +46,22 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB:: @ 81B1BBB special sub_80EB7C4 waitmessage delay 80 - msgbox PetalburgCity_PokemonCenter_1F_Text_1B2137, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_1B2137, MSGBOX_DEFAULT release end PetalburgCity_PokemonCenter_1F_EventScript_1B1BD1:: @ 81B1BD1 - msgbox PetalburgCity_PokemonCenter_1F_Text_1B1FA3, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_1B1FA3, MSGBOX_DEFAULT release end PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB:: @ 81B1BDB - msgbox PetalburgCity_PokemonCenter_1F_Text_1B202F, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_1B202F, MSGBOX_DEFAULT goto PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9 end PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9:: @ 81B1BE9 - msgbox PetalburgCity_PokemonCenter_1F_Text_1B2063, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_1B2063, MSGBOX_DEFAULT multichoice 17, 6, 20, 0 switch VAR_RESULT case 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C36 @@ -71,12 +71,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9:: @ 81B1BE9 end PetalburgCity_PokemonCenter_1F_EventScript_1B1C28:: @ 81B1C28 - msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D3A, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D3A, MSGBOX_DEFAULT goto PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9 end PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 - msgbox PetalburgCity_PokemonCenter_1F_Text_1B207F, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_1B207F, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 0 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 @@ -91,7 +91,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 end PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D:: @ 81B1C6D - msgbox PetalburgCity_PokemonCenter_1F_Text_1B20CE, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_1B20CE, MSGBOX_DEFAULT release end @@ -99,7 +99,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C77:: @ 81B1C77 goto_if_unset FLAG_BADGE05_GET, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 goto_if_set FLAG_SYS_EXDATA_ENABLE, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 setflag FLAG_SYS_EXDATA_ENABLE - msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, 3 + msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, MSGBOX_SIGN release end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index ab21dbba0..b64d86a70 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -5,14 +5,14 @@ LittlerootTown_MaysHouse_2F_EventScript_1B6950:: @ 81B6950 LittlerootTown_BrendansHouse_1F_EventScript_1B6956:: @ 81B6956 LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 - msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_172429, MSGBOX_DEFAULT applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 compare VAR_0x8005, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B699F compare VAR_0x8005, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B69AA - msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_172453, MSGBOX_DEFAULT closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 @@ -37,7 +37,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1B69B5:: @ 81B69B5 LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 - msgbox LittlerootTown_BrendansHouse_1F_Text_172531, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_172531, MSGBOX_DEFAULT closemessage applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC @@ -60,7 +60,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF LittlerootTown_BrendansHouse_2F_EventScript_1B69EB:: @ 81B69EB LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB goto_if_set FLAG_SET_WALL_CLOCK, LittlerootTown_BrendansHouse_2F_EventScript_1B6A91 - msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, MSGBOX_DEFAULT call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B delay 30 setvar VAR_LITTLEROOT_INTRO_STATE, 6 @@ -84,7 +84,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A0843 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT closemessage applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 waitmovement 0 @@ -97,7 +97,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A083F waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT closemessage applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 waitmovement 0 @@ -160,7 +160,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC waitmovement 0 playbgm MUS_INTER_V, FALSE - msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB waitmovement 0 @@ -169,8 +169,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF call LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, 4 - msgbox LittlerootTown_BrendansHouse_1F_Text_172644, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, MSGBOX_DEFAULT + msgbox LittlerootTown_BrendansHouse_1F_Text_172644, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 @@ -185,7 +185,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 waitmovement 0 playbgm MUS_INTER_V, FALSE - msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE waitmovement 0 @@ -194,8 +194,8 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E call LittlerootTown_MaysHouse_1F_EventScript_1B6BBE applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1A0843 waitmovement 0 - msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, 4 - msgbox LittlerootTown_MaysHouse_1F_Text_172644, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, MSGBOX_DEFAULT + msgbox LittlerootTown_MaysHouse_1F_Text_172644, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 @@ -210,7 +210,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D waitmovement 0 applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, MSGBOX_DEFAULT closemessage return @@ -218,7 +218,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE:: @ 81B6BBE LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A0841 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_172841, MSGBOX_DEFAULT fadedefaultbgm special TurnOffTVScreen setflag FLAG_SYS_TV_HOME @@ -261,33 +261,33 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 compare VAR_LITTLEROOT_INTRO_STATE, 7 goto_if_ge LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C - msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_172429, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33 - msgbox LittlerootTown_BrendansHouse_1F_Text_172BBC, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_172BBC, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D goto_if_set FLAG_RECEIVED_AMULET_COIN, LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 - msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_172782, MSGBOX_DEFAULT giveitem ITEM_AMULET_COIN compare VAR_RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B - msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, MSGBOX_DEFAULT setflag FLAG_RECEIVED_AMULET_COIN release end LittlerootTown_BrendansHouse_1F_EventScript_1B6C72:: @ 81B6C72 - msgbox LittlerootTown_BrendansHouse_1F_Text_172717, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_172717, MSGBOX_DEFAULT goto LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A end LittlerootTown_BrendansHouse_1F_EventScript_1B6C80:: @ 81B6C80 - msgbox LittlerootTown_BrendansHouse_1F_Text_1726D2, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1726D2, MSGBOX_DEFAULT release end @@ -295,12 +295,12 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A:: @ 81B6C8A closemessage call LittlerootTown_BrendansHouse_1F_EventScript_1A02CA incrementgamestat GAME_STAT_RESTED_AT_HOME - msgbox LittlerootTown_BrendansHouse_1F_Text_17276B, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_17276B, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C:: @ 81B6C9C - msgbox LittlerootTown_BrendansHouse_1F_Text_1726E7, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1726E7, MSGBOX_DEFAULT release end @@ -310,7 +310,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CA6:: @ 81B6CA6 faceplayer waitse playmoncry SPECIES_MACHOKE, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_17281D, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_17281D, MSGBOX_DEFAULT waitmoncry release end @@ -321,7 +321,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CB9:: @ 81B6CB9 faceplayer waitse playmoncry SPECIES_MACHOKE, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_172831, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_172831, MSGBOX_DEFAULT waitmoncry release end @@ -378,15 +378,15 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 - msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, MSGBOX_DEFAULT giveitem ITEM_SS_TICKET - msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE - msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index f05821107..bd3323024 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -52,7 +52,7 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E - msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 + msgbox FallarborTown_ContestLobby_Text_1B6E9D, MSGBOX_DEFAULT specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, -1 goto_if_ne FallarborTown_ContestLobby_EventScript_1B76EF @@ -61,7 +61,7 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 end FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5 - msgbox FallarborTown_ContestLobby_Text_1B6EA8, 4 + msgbox FallarborTown_ContestLobby_Text_1B6EA8, MSGBOX_DEFAULT releaseall end @@ -74,19 +74,19 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF end FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E - msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4 + msgbox FallarborTown_ContestLobby_Text_1B6FF0, MSGBOX_DEFAULT dotimebasedevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B774F goto FallarborTown_ContestLobby_EventScript_1B7759 end FallarborTown_ContestLobby_EventScript_1B7726:: @ 81B7726 - msgbox FallarborTown_ContestLobby_Text_1B6F1F, 4 + msgbox FallarborTown_ContestLobby_Text_1B6F1F, MSGBOX_DEFAULT goto FallarborTown_ContestLobby_EventScript_1B7734 end FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 - msgbox FallarborTown_ContestLobby_Text_1B6EF1, 4 + msgbox FallarborTown_ContestLobby_Text_1B6EF1, MSGBOX_DEFAULT goto FallarborTown_ContestLobby_EventScript_1B7742 end @@ -99,24 +99,24 @@ FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 end FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F - msgbox FallarborTown_ContestLobby_Text_1B70F6, 4 + msgbox FallarborTown_ContestLobby_Text_1B70F6, MSGBOX_DEFAULT releaseall end FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759 - msgbox FallarborTown_ContestLobby_Text_1B704A, 4 + msgbox FallarborTown_ContestLobby_Text_1B704A, MSGBOX_DEFAULT giveitem ITEM_PECHA_BERRY setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto FallarborTown_ContestLobby_EventScript_1B76EF end FallarborTown_ContestLobby_EventScript_1B7776:: @ 81B7776 - msgbox FallarborTown_ContestLobby_Text_1B717C, 4 + msgbox FallarborTown_ContestLobby_Text_1B717C, MSGBOX_DEFAULT releaseall end FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780 - msgbox FallarborTown_ContestLobby_Text_1B71D2, 4 + msgbox FallarborTown_ContestLobby_Text_1B71D2, MSGBOX_DEFAULT releaseall end @@ -146,7 +146,7 @@ SlateportCity_ContestLobby_EventScript_1B77B6:: @ 81B77B6 VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 lock faceplayer - msgbox FallarborTown_ContestLobby_Text_1B742F, 4 + msgbox FallarborTown_ContestLobby_Text_1B742F, MSGBOX_DEFAULT specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77DC @@ -155,7 +155,7 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 end FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC - msgbox FallarborTown_ContestLobby_Text_1B7469, 4 + msgbox FallarborTown_ContestLobby_Text_1B7469, MSGBOX_DEFAULT release end @@ -166,15 +166,15 @@ FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 end FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6 - msgbox FallarborTown_ContestLobby_Text_1B7578, 4 + msgbox FallarborTown_ContestLobby_Text_1B7578, MSGBOX_DEFAULT release end FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800 - msgbox FallarborTown_ContestLobby_Text_1B74B4, 4 + msgbox FallarborTown_ContestLobby_Text_1B74B4, MSGBOX_DEFAULT giveitem ITEM_PECHA_BERRY setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR - msgbox FallarborTown_ContestLobby_Text_1B753A, 4 + msgbox FallarborTown_ContestLobby_Text_1B753A, MSGBOX_DEFAULT release end @@ -228,7 +228,7 @@ FallarborTown_ContestLobby_EventScript_1B7878:: @ 81B7878 end FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 - msgbox FallarborTown_ContestLobby_Text_1B7381, 4 + msgbox FallarborTown_ContestLobby_Text_1B7381, MSGBOX_DEFAULT releaseall end @@ -253,17 +253,17 @@ FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 end FallarborTown_ContestLobby_EventScript_1B78F3:: @ 81B78F3 - msgbox FallarborTown_ContestLobby_Text_1B733B, 4 + msgbox FallarborTown_ContestLobby_Text_1B733B, MSGBOX_DEFAULT goto FallarborTown_ContestLobby_EventScript_1B791D end FallarborTown_ContestLobby_EventScript_1B7901:: @ 81B7901 - msgbox FallarborTown_ContestLobby_Text_1B7347, 4 + msgbox FallarborTown_ContestLobby_Text_1B7347, MSGBOX_DEFAULT goto FallarborTown_ContestLobby_EventScript_1B791D end FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F - msgbox FallarborTown_ContestLobby_Text_1B735A, 4 + msgbox FallarborTown_ContestLobby_Text_1B735A, MSGBOX_DEFAULT goto FallarborTown_ContestLobby_EventScript_1B791D end @@ -284,36 +284,36 @@ FallarborTown_ContestLobby_EventScript_1B7936:: @ 81B7936 end FallarborTown_ContestLobby_EventScript_1B7938:: @ 81B7938 - msgbox FallarborTown_ContestLobby_Text_1B73B7, 4 + msgbox FallarborTown_ContestLobby_Text_1B73B7, MSGBOX_DEFAULT releaseall end FallarborTown_ContestLobby_EventScript_1B7942:: @ 81B7942 - msgbox FallarborTown_ContestLobby_Text_1B73F1, 4 + msgbox FallarborTown_ContestLobby_Text_1B73F1, MSGBOX_DEFAULT releaseall end FallarborTown_ContestLobby_EventScript_1B794C:: @ 81B794C special CloseLink - msgbox FallarborTown_ContestLobby_Text_1A4A30, 4 + msgbox FallarborTown_ContestLobby_Text_1A4A30, MSGBOX_DEFAULT releaseall end FallarborTown_ContestLobby_EventScript_1B7959:: @ 81B7959 special CloseLink - msgbox FallarborTown_ContestLobby_Text_1A4B1D, 4 + msgbox FallarborTown_ContestLobby_Text_1A4B1D, MSGBOX_DEFAULT releaseall end FallarborTown_ContestLobby_EventScript_1B7966:: @ 81B7966 special CloseLink - msgbox FallarborTown_ContestLobby_Text_1A10EB, 4 + msgbox FallarborTown_ContestLobby_Text_1A10EB, MSGBOX_DEFAULT releaseall end FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973 special CloseLink - msgbox FallarborTown_ContestLobby_Text_1A4A85, 4 + msgbox FallarborTown_ContestLobby_Text_1A4A85, MSGBOX_DEFAULT releaseall end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index fab2bfbff..b13eeca6d 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -4,7 +4,7 @@ Route111_EventScript_1A3858:: @ 81A3858 msgbox Route111_Text_1A3520, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq Route111_EventScript_1A3877 - msgbox Route111_Text_1A37B5, 4 + msgbox Route111_Text_1A37B5, MSGBOX_DEFAULT release end @@ -12,7 +12,7 @@ Route111_EventScript_1A3877:: @ 81A3877 giveitem ITEM_TM43_SECRET_POWER compare VAR_RESULT, 0 goto_if_eq Route111_EventScript_1A38D9 - msgbox Route111_Text_1A35C5, 4 + msgbox Route111_Text_1A35C5, MSGBOX_DEFAULT closemessage setflag FLAG_RECEIVED_SECRET_POWER clearflag FLAG_HIDE_TM_SALESMAN_SLATEPORT @@ -37,7 +37,7 @@ Route111_EventScript_1A38CE:: @ 81A38CE return Route111_EventScript_1A38D9:: @ 81A38D9 - msgbox Route111_Text_1A37F6, 4 + msgbox Route111_Text_1A37F6, MSGBOX_DEFAULT release end diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 486e5d68c..9c22f6595 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -30,21 +30,21 @@ EventScript_1A6EBB: EventScript_1A6EF1: special GetMomOrDadStringForTVMessage - msgbox UnknownString_81A0E68, 4 + msgbox UnknownString_81A0E68, MSGBOX_DEFAULT special TurnOffTVScreen releaseall end EventScript_1A6F01: - msgbox UnknownString_817288C, 4 + msgbox UnknownString_817288C, MSGBOX_DEFAULT releaseall end EventScript_1A6F0B: .ifdef SAPPHIRE - msgbox UnknownString_8172D30, 4 + msgbox UnknownString_8172D30, MSGBOX_DEFAULT .else - msgbox UnknownString_8172C50, 4 + msgbox UnknownString_8172C50, MSGBOX_DEFAULT .endif special InitRoamer clearflag FLAG_SYS_TV_LATI @@ -70,7 +70,7 @@ EventScript_1A6F37: EventScript_1A6F3F: special GetMomOrDadStringForTVMessage - msgbox UnknownString_81A0E68, 4 + msgbox UnknownString_81A0E68, MSGBOX_DEFAULT goto EventScript_1A6F37 end |