diff options
Diffstat (limited to 'data')
68 files changed, 714 insertions, 715 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 5d59eb75c..df061f4ac 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -11,12 +11,15 @@ #include "constants/flags.h" #include "constants/game_stat.h" #include "constants/decorations.h" +#include "constants/item.h" #include "constants/items.h" #include "constants/heal_locations.h" #include "constants/layouts.h" #include "constants/map_scripts.h" #include "constants/maps.h" #include "constants/moves.h" +#include "constants/pokemon.h" +#include "constants/script_menu.h" #include "constants/secret_bases.h" #include "constants/songs.h" #include "constants/species.h" @@ -822,7 +825,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_ROUTE_103_BIRCH setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR - setflag FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER + setflag FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE setflag FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON setflag FLAG_UNKNOWN_0x393 @@ -1019,50 +1022,50 @@ Std_ObtainItem:: @ 8271AD3 EventScript_271AE3:: @ 8271AE3 bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 checkitemtype VAR_0x8000 - call EventScript_271B08 + call EventScript_BufferStdString compare VAR_0x8007, 1 call_if_eq EventScript_271B95 compare VAR_0x8007, 0 call_if_eq EventScript_271BA9 return -EventScript_271B08:: @ 8271B08 +EventScript_BufferStdString:: @ 8271B08 switch VAR_RESULT - case 1, EventScript_271B45 - case 5, EventScript_271B55 - case 2, EventScript_271B65 - case 3, EventScript_271B75 - case 4, EventScript_271B85 + case POCKET_ITEMS, EventScript_StdStringItem + case POCKET_KEY_ITEMS, EventScript_StdStringKeyItems + case POCKET_POKE_BALLS, EventScript_StdStringPokeballs + case POCKET_TM_HM, EventScript_StdStringTMHMS + case POCKET_BERRIES, EventScript_StdStringBerries end -EventScript_271B45:: @ 8271B45 - bufferstdstring 2, 14 +EventScript_StdStringItem:: @ 8271B45 + bufferstdstring 2, STDSTRING_ITEMS compare VAR_0x8007, 1 - call_if_eq EventScript_271BAF + call_if_eq EventScript_PlayFanfare4 return -EventScript_271B55:: @ 8271B55 - bufferstdstring 2, 15 +EventScript_StdStringKeyItems:: @ 8271B55 + bufferstdstring 2, STDSTRING_KEYITEMS compare VAR_0x8007, 1 - call_if_eq EventScript_271BAF + call_if_eq EventScript_PlayFanfare4 return -EventScript_271B65:: @ 8271B65 - bufferstdstring 2, 16 +EventScript_StdStringPokeballs:: @ 8271B65 + bufferstdstring 2, STDSTRING_POKEBALLS compare VAR_0x8007, 1 - call_if_eq EventScript_271BAF + call_if_eq EventScript_PlayFanfare4 return -EventScript_271B75:: @ 8271B75 - bufferstdstring 2, 17 +EventScript_StdStringTMHMS:: @ 8271B75 + bufferstdstring 2, STDSTRING_TMHMS compare VAR_0x8007, 1 call_if_eq EventScript_271BB3 return -EventScript_271B85:: @ 8271B85 - bufferstdstring 2, 18 +EventScript_StdStringBerries:: @ 8271B85 + bufferstdstring 2, STDSTRING_BERRIES compare VAR_0x8007, 1 - call_if_eq EventScript_271BAF + call_if_eq EventScript_PlayFanfare4 return EventScript_271B95:: @ 8271B95 @@ -1076,7 +1079,7 @@ EventScript_271BA9:: @ 8271BA9 setvar VAR_RESULT, 0 return -EventScript_271BAF:: @ 8271BAF +EventScript_PlayFanfare4:: @ 8271BAF playfanfare MUS_FANFA4 return @@ -1120,7 +1123,7 @@ Std_FindItem:: @ 8271BFD copyvar VAR_0x8007, VAR_RESULT bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 checkitemtype VAR_0x8000 - call EventScript_271B08 + call EventScript_BufferStdString compare VAR_0x8007, 1 call_if_eq EventScript_PickItemUp compare VAR_0x8007, 0 @@ -1173,7 +1176,7 @@ EventScript_HiddenItemScript:: @ 8271CB7 copyvar VAR_0x8007, VAR_RESULT bufferitemnameplural 1, VAR_0x8005, 1 checkitemtype VAR_0x8005 - call EventScript_271B08 + call EventScript_BufferStdString compare VAR_0x8007, 1 goto_if_eq EventScript_271CE8 compare VAR_0x8007, 0 @@ -1254,7 +1257,7 @@ EventScript_PC:: @ 8271D92 EventScript_271DAC:: @ 8271DAC message gText_WhichPCShouldBeAccessed waitmessage - special ScrSpecial_CreatePCMenu + special ScriptMenu_CreatePCMultichoice waitstate goto EventScript_271DBC end @@ -1265,7 +1268,7 @@ EventScript_271DBC:: @ 8271DBC case 1, EventScript_271DF9 case 2, EventScript_271E54 case 3, EventScript_271E47 - case 127, EventScript_271E47 + case MULTI_B_PRESSED, EventScript_271E47 end EventScript_271DF9:: @ 8271DF9 @@ -1655,15 +1658,13 @@ Route101_EventScript_272184:: @ 8272184 msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT return -BattleFrontier_OutsideWest_EventScript_2721E2:: @ 82721E2 -LilycoveCity_Harbor_EventScript_2721E2:: @ 82721E2 -SlateportCity_Harbor_EventScript_2721E2:: @ 82721E2 +Common_EventScript_FerryDepart:: @ 82721E2 delay 60 - applymovement VAR_0x8004, SlateportCity_Harbor_Movement_2721F0 + applymovement VAR_0x8004, Movement_FerryDepart waitmovement 0 return -SlateportCity_Harbor_Movement_2721F0: @ 82721F0 +Movement_FerryDepart: @ 82721F0 walk_slow_right walk_slow_right walk_slow_right @@ -1720,7 +1721,7 @@ SouthernIsland_Exterior_EventScript_272250:: @ 8272250 call_if_eq BattleFrontier_OutsideWest_EventScript_242A2C delay 30 hideobjectat 255, MAP_PETALBURG_CITY - call BattleFrontier_OutsideWest_EventScript_2721E2 + call Common_EventScript_FerryDepart return EventScript_272274:: @ 8272274 @@ -3663,7 +3664,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 message BattleFrontier_BattleTowerLobby_Text_27F7BA waitmessage - multichoice 20, 8, 45, 1 + multichoice 20, 8, MULTI_SATISFACTION, 1 copyvar VAR_0x8008, VAR_RESULT compare VAR_RESULT, 0 call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38 @@ -3855,7 +3856,7 @@ MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D .include "data/text/roulette.inc" .include "data/text/pokedex_rating.inc" .include "data/text/lottery_corner.inc" - .include "data/text/eon_ticket.inc" + .include "data/text/event_ticket_1.inc" .include "data/text/braille.inc" .include "data/text/berries.inc" .include "data/text/shoal_cave.inc" @@ -5094,77 +5095,7 @@ VerdanturfTown_BattleTentLobby_Text_2C6878: @ 82C6878 .string "The VERDANTURF BATTLE TENT\n" .string "rules are listed.$" -LilycoveCity_Harbor_Text_2C68A5: @ 82C68A5 - .string "What's up, youngster?\p" - .string "What, it's you who's supposed to have\n" - .string "a tattered old map?\p" - .string "Let's have a look.\n" - .string "… … … … … …\p" - .string "Boy, this is quite a ways away.\n" - .string "I'm afraid I can't help you…$" - -LilycoveCity_Harbor_Text_2C6951: @ 82C6951 - .string "BRINEY: Hold on a second!\p" - .string "What's the idea of turning down\n" - .string "someone that I owe so much to?$" - -LilycoveCity_Harbor_Text_2C69AA: @ 82C69AA - .string "{PLAYER}{KUN}, I'm terribly sorry.\p" - .string "You came to me seeking my help,\n" - .string "and we almost turned you away.\p" - .string "Well, let me make things right.\p" - .string "We'll sail right away, of course!\p" - .string "Let's find this island on\n" - .string "this OLD SEA MAP!$" - -LilycoveCity_Harbor_Text_2C6A71: @ 82C6A71 - .string "Is it you who brought that odd\n" - .string "ticket?\p" - .string "Where you're trying to go is an island\n" - .string "that's far, far away.\p" - .string "No one knows what awaits there…\p" - .string "The very thought excites my blood\n" - .string "as a sailing man!\p" - .string "Get on board, youngster!$" - -FarawayIsland_Entrance_Text_2C6B42: @ 82C6B42 - .string "CAPT. BRINEY can be so maddeningly\n" - .string "fickle…\p" - .string "Do you want to return to LILYCOVE?$" - -BirthIsland_Harbor_Text_2C6B90: @ 82C6B90 - .string "What an oddly shaped island, eh?\n" - .string "Do you want to return to LILYCOVE?$" - -LilycoveCity_Harbor_Text_2C6BD4: @ 82C6BD4 - .string "Is it you who brought those\n" - .string "odd tickets?\p" - .string "… … …Hm.\p" - .string "These tickets will get you to islands\n" - .string "that are far, far away.\p" - .string "No one knows what awaits there,\n" - .string "or what may happen there.\p" - .string "The very thought excites my blood\n" - .string "as a sailing man!\p" - .string "Get on board, youngster!\n" - .string "Where shall we sail first?$" - -NavelRock_Harbor_Text_2C6CE6: @ 82C6CE6 - .string "Did… Did you hear that?\n" - .string "That low growling from deep in there.\p" - .string "Are you sure it's safe?\n" - .string "Do you think we should leave?$" - -FarawayIsland_Entrance_Text_2C6D5A: @ 82C6D5A - .string "The writing is fading as if it was\n" - .string "written a long time ago…\p" - .string "“…ber, 6th day\n" - .string "If any human…sets foot here…\l" - .string "again…et it be a kindhearted pers…\l" - .string "…ith that hope, I depar…”$" - -FarawayIsland_Interior_Text_2C6DFF: @ 82C6DFF - .string "Myuu…$" + .include "data/text/event_ticket_2.inc" MauvilleCity_Text_2C6E05: @ 82C6E05 .string "This move can be learned only\n" diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index f3a0ecfb4..205ee0e71 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -169,30 +169,30 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768 - multichoice 19, 4, 103, 1 + multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25779E case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 - case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 BattleFrontier_BattleArenaBattleRoom_EventScript_257768:: @ 8257768 - multichoice 20, 6, 104, 1 + multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 - case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 BattleFrontier_BattleArenaBattleRoom_EventScript_25779E:: @ 825779E message BattleFrontier_BattleArenaBattleRoom_Text_257F04 waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0 - case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0:: @ 82577D0 call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4 @@ -208,11 +208,11 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA:: @ 82577DA BattleFrontier_BattleArenaBattleRoom_EventScript_257808:: @ 8257808 message BattleFrontier_BattleArenaBattleRoom_Text_257E9E waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257615 - case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 BattleFrontier_BattleArenaBattleRoom_EventScript_25783A:: @ 825783A closemessage @@ -286,21 +286,21 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4 call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B - multichoice 19, 4, 103, 1 + multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961 case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25779E case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 - case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 + case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 BattleFrontier_BattleArenaBattleRoom_EventScript_25792B:: @ 825792B - multichoice 20, 6, 104, 1 + multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961 case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257808 - case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 + case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 call BattleFrontier_BattleArenaBattleRoom_EventScript_242170 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 85b3ba78e..0c55e9917 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -101,11 +101,11 @@ BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59 goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF message BattleFrontier_BattleArenaLobby_Text_256B19 waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleArenaLobby_EventScript_255DBF case 0, BattleFrontier_BattleArenaLobby_EventScript_255DBA - case 127, BattleFrontier_BattleArenaLobby_EventScript_255DBF + case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255DBF BattleFrontier_BattleArenaLobby_EventScript_255DBA:: @ 8255DBA call BattleFrontier_BattleArenaLobby_EventScript_23E8B4 @@ -140,20 +140,20 @@ BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4 BattleFrontier_BattleArenaLobby_EventScript_255E0B:: @ 8255E0B message BattleFrontier_BattleArenaLobby_Text_2561EA waitmessage - multichoice 17, 6, 23, 0 + multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT case 0, BattleFrontier_BattleArenaLobby_EventScript_255E47 case 1, BattleFrontier_BattleArenaLobby_EventScript_255F9F case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB - case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB + case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255FFB BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 message BattleFrontier_BattleArenaLobby_Text_256513 waitmessage - multichoice 17, 6, 24, 0 + multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB - case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB + case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255FFB setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 @@ -377,14 +377,14 @@ BattleFrontier_BattleArenaLobby_EventScript_2560CA:: @ 82560CA BattleFrontier_BattleArenaLobby_EventScript_2560D9:: @ 82560D9 message BattleFrontier_BattleArenaLobby_Text_256DDF waitmessage - multichoice 17, 2, 96, 0 + multichoice 17, 2, MULTI_BATTLE_ARENA_RULES, 0 switch VAR_RESULT case 0, BattleFrontier_BattleArenaLobby_EventScript_25612C case 1, BattleFrontier_BattleArenaLobby_EventScript_25613A case 2, BattleFrontier_BattleArenaLobby_EventScript_256148 case 3, BattleFrontier_BattleArenaLobby_EventScript_256156 case 4, BattleFrontier_BattleArenaLobby_EventScript_256164 - case 127, BattleFrontier_BattleArenaLobby_EventScript_256164 + case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_256164 end BattleFrontier_BattleArenaLobby_EventScript_25612C:: @ 825612C diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index f4e796bba..4ba6db967 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -131,11 +131,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991 goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9 message BattleFrontier_BattleDomeLobby_Text_24AE17 waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleDomeLobby_EventScript_2499E9 case 0, BattleFrontier_BattleDomeLobby_EventScript_2499E4 - case 127, BattleFrontier_BattleDomeLobby_EventScript_2499E9 + case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_2499E9 BattleFrontier_BattleDomeLobby_EventScript_2499E4:: @ 82499E4 call BattleFrontier_BattleDomeLobby_EventScript_23E8B4 @@ -193,20 +193,20 @@ BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72 compare VAR_FRONTIER_BATTLE_MODE, 1 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D15 waitmessage - multichoice 17, 6, 23, 0 + multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT case 0, BattleFrontier_BattleDomeLobby_EventScript_249ABF case 1, BattleFrontier_BattleDomeLobby_EventScript_249BFA case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64 - case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64 + case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C64 BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF message BattleFrontier_BattleDomeLobby_Text_24A210 waitmessage - multichoice 17, 6, 24, 0 + multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64 - case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64 + case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C64 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 @@ -503,13 +503,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249E34:: @ 8249E34 BattleFrontier_BattleDomeLobby_EventScript_249E43:: @ 8249E43 message BattleFrontier_BattleDomeLobby_Text_24AE8B waitmessage - multichoice 17, 4, 98, 0 + multichoice 17, 4, MULTI_BATTLE_DOME_RULES, 0 switch VAR_RESULT case 0, BattleFrontier_BattleDomeLobby_EventScript_249E8B case 1, BattleFrontier_BattleDomeLobby_EventScript_249E99 case 2, BattleFrontier_BattleDomeLobby_EventScript_249EA7 case 3, BattleFrontier_BattleDomeLobby_EventScript_249EB5 - case 127, BattleFrontier_BattleDomeLobby_EventScript_249EB5 + case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249EB5 end BattleFrontier_BattleDomeLobby_EventScript_249E8B:: @ 8249E8B diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index df43e92a3..3f5d53ac1 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -35,7 +35,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 - multichoice 16, 0, 73, 1 + multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, 1 switch VAR_RESULT case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5 @@ -43,26 +43,26 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349 case 5, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377 - case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1:: @ 824B2C1 - multichoice 16, 2, 107, 1 + multichoice 16, 2, MULTI_TOURNEY_NO_RECORD, 1 switch VAR_RESULT case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5 case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349 case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377 - case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F BattleFrontier_BattleDomePreBattleRoom_EventScript_24B30D:: @ 824B30D message BattleFrontier_BattleDomePreBattleRoom_Text_24BAF7 waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F - case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F:: @ 824B33F call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8B4 @@ -78,11 +78,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349:: @ 824B349 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377 message BattleFrontier_BattleDomePreBattleRoom_Text_24BA93 waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9 - case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9 setvar VAR_0x8004, 12 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 4bea7068f..9569d23ca 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -106,11 +106,11 @@ BattleFrontier_BattleFactoryLobby_EventScript_25853B:: @ 825853B goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258582 message BattleFrontier_BattleFactoryLobby_Text_259388 waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleFactoryLobby_EventScript_258582 case 0, BattleFrontier_BattleFactoryLobby_EventScript_25857D - case 127, BattleFrontier_BattleFactoryLobby_EventScript_258582 + case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_258582 BattleFrontier_BattleFactoryLobby_EventScript_25857D:: @ 825857D call BattleFrontier_BattleFactoryLobby_EventScript_23E8B4 @@ -166,20 +166,20 @@ BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606 compare VAR_FRONTIER_BATTLE_MODE, 1 call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C9 waitmessage - multichoice 17, 6, 23, 0 + multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT case 0, BattleFrontier_BattleFactoryLobby_EventScript_258653 case 1, BattleFrontier_BattleFactoryLobby_EventScript_258768 case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D - case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879D + case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_25879D BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653 message BattleFrontier_BattleFactoryLobby_Text_258BE9 waitmessage - multichoice 17, 6, 24, 0 + multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D - case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879D + case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_25879D setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -347,7 +347,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258839:: @ 8258839 BattleFrontier_BattleFactoryLobby_EventScript_258848:: @ 8258848 message BattleFrontier_BattleFactoryLobby_Text_259743 waitmessage - multichoice 17, 0, 99, 0 + multichoice 17, 0, MULTI_BATTLE_FACTORY_RULES, 0 switch VAR_RESULT case 0, BattleFrontier_BattleFactoryLobby_EventScript_2588A6 case 1, BattleFrontier_BattleFactoryLobby_EventScript_2588B4 @@ -355,7 +355,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258848:: @ 8258848 case 3, BattleFrontier_BattleFactoryLobby_EventScript_2588D0 case 4, BattleFrontier_BattleFactoryLobby_EventScript_2588DE case 5, BattleFrontier_BattleFactoryLobby_EventScript_2588EC - case 127, BattleFrontier_BattleFactoryLobby_EventScript_2588EC + case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_2588EC end BattleFrontier_BattleFactoryLobby_EventScript_2588A6:: @ 82588A6 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 2fd3ee66d..f65ffae0d 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -118,30 +118,30 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6 - multichoice 19, 4, 103, 1 + multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98 case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38 case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6:: @ 8259CC6 - multichoice 20, 6, 104, 1 + multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98 case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38 case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC:: @ 8259CFC message BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABD2 waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E:: @ 8259D2E call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8B4 @@ -157,11 +157,11 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38:: @ 8259D38 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66:: @ 8259D66 message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A37A waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98 setvar VAR_0x8004, 12 @@ -422,21 +422,21 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110 - multichoice 19, 4, 103, 1 + multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146 case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CFC case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38 case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 + case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110:: @ 825A110 - multichoice 20, 6, 104, 1 + multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146 case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38 case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 + case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index bdd4a9ff4..605807580 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -126,30 +126,30 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42 - multichoice 19, 4, 103, 1 + multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14 case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78 case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4 case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2 - case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42:: @ 824FA42 - multichoice 20, 6, 104, 1 + multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14 case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4 case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2 - case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78:: @ 824FA78 message BattleFrontier_BattlePalaceBattleRoom_Text_25009E waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA - case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA:: @ 824FAAA call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8B4 @@ -165,11 +165,11 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4:: @ 824FAB4 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2:: @ 824FAE2 message BattleFrontier_BattlePalaceBattleRoom_Text_25005A waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA - case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14:: @ 824FB14 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 @@ -209,21 +209,21 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79 call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0 - multichoice 19, 4, 103, 1 + multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06 case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA78 case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4 case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2 - case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 + case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0:: @ 824FBD0 - multichoice 20, 6, 104, 1 + multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06 case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4 case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2 - case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 + case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 call BattleFrontier_BattlePalaceBattleRoom_EventScript_242170 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index be6d6c7d5..c3b688661 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -101,11 +101,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1 goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907 message BattleFrontier_BattlePalaceLobby_Text_24EF16 waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattlePalaceLobby_EventScript_24D907 case 0, BattleFrontier_BattlePalaceLobby_EventScript_24D902 - case 127, BattleFrontier_BattlePalaceLobby_EventScript_24D907 + case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24D907 BattleFrontier_BattlePalaceLobby_EventScript_24D902:: @ 824D902 call BattleFrontier_BattlePalaceLobby_EventScript_23E8B4 @@ -164,20 +164,20 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999 compare VAR_FRONTIER_BATTLE_MODE, 1 call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB6 waitmessage - multichoice 17, 6, 23, 0 + multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT case 0, BattleFrontier_BattlePalaceLobby_EventScript_24D9E6 case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB20 case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 - case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 + case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 message BattleFrontier_BattlePalaceLobby_Text_24E119 waitmessage - multichoice 17, 6, 24, 0 + multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 - case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 + case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 @@ -406,7 +406,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DCA6:: @ 824DCA6 BattleFrontier_BattlePalaceLobby_EventScript_24DCB5:: @ 824DCB5 message BattleFrontier_BattlePalaceLobby_Text_24EF88 waitmessage - multichoice 16, 0, 100, 0 + multichoice 16, 0, MULTI_BATTLE_PALACE_RULES, 0 switch VAR_RESULT case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DD13 case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DD21 @@ -414,7 +414,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DCB5:: @ 824DCB5 case 3, BattleFrontier_BattlePalaceLobby_EventScript_24DD3D case 4, BattleFrontier_BattlePalaceLobby_EventScript_24DD4B case 5, BattleFrontier_BattlePalaceLobby_EventScript_24DD59 - case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DD59 + case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DD59 end BattleFrontier_BattlePalaceLobby_EventScript_24DD13:: @ 824DD13 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 7a9f6e50c..05cdfa8a3 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -133,20 +133,20 @@ BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868 BattleFrontier_BattlePikeLobby_EventScript_25B87F:: @ 825B87F message BattleFrontier_BattlePikeLobby_Text_25BBC1 waitmessage - multichoice 17, 6, 23, 0 + multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT case 0, BattleFrontier_BattlePikeLobby_EventScript_25B8BB case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA1A case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76 - case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76 + case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA76 BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB message BattleFrontier_BattlePikeLobby_Text_25BE35 waitmessage - multichoice 17, 6, 24, 0 + multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76 - case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76 + case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA76 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 @@ -297,13 +297,13 @@ BattleFrontier_BattlePikeLobby_EventScript_25BAC6:: @ 825BAC6 BattleFrontier_BattlePikeLobby_EventScript_25BAD5:: @ 825BAD5 message BattleFrontier_BattlePikeLobby_Text_25C621 waitmessage - multichoice 16, 4, 102, 0 + multichoice 16, 4, MULTI_BATTLE_PIKE_RULES, 0 switch VAR_RESULT case 0, BattleFrontier_BattlePikeLobby_EventScript_25BB1D case 1, BattleFrontier_BattlePikeLobby_EventScript_25BB2B case 2, BattleFrontier_BattlePikeLobby_EventScript_25BB39 case 3, BattleFrontier_BattlePikeLobby_EventScript_25BB47 - case 127, BattleFrontier_BattlePikeLobby_EventScript_25BB47 + case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BB47 end BattleFrontier_BattlePikeLobby_EventScript_25BB1D:: @ 825BB1D diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index 5429ea605..927222e8c 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -159,7 +159,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A message BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 release diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc index 87915cd2c..2011c42df 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc @@ -102,7 +102,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185 case 8, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336 case 9, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359 case 10, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D - case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D + case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E @@ -216,7 +216,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E case 3, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459 case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D - case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D + case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 @@ -286,7 +286,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1 case 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA case 5, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD case 6, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D - case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D + case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E @@ -368,7 +368,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602 case 7, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785 case 8, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8 case 9, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D - case 127, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D + case MULTI_B_PRESSED, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 1860efd16..b2f7d4579 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -137,20 +137,20 @@ BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1 BattleFrontier_BattlePyramidLobby_EventScript_2508C8:: @ 82508C8 message BattleFrontier_BattlePyramidLobby_Text_250FA7 waitmessage - multichoice 17, 6, 23, 0 + multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT case 0, BattleFrontier_BattlePyramidLobby_EventScript_250904 case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A68 case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 - case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 + case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 message BattleFrontier_BattlePyramidLobby_Text_251248 waitmessage - multichoice 17, 6, 24, 0 + multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 - case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 + case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 @@ -269,12 +269,12 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE end BattleFrontier_BattlePyramidLobby_EventScript_250AF0:: @ 8250AF0 - multichoice 17, 6, 24, 0 + multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT case 0, BattleFrontier_BattlePyramidLobby_EventScript_250B28 case 1, BattleFrontier_BattlePyramidLobby_EventScript_250B66 case 2, BattleFrontier_BattlePyramidLobby_EventScript_250B27 - case 127, BattleFrontier_BattlePyramidLobby_EventScript_250B27 + case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250B27 return BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27 @@ -508,12 +508,12 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E00:: @ 8250E00 return BattleFrontier_BattlePyramidLobby_EventScript_250E09:: @ 8250E09 - multichoice 17, 6, 83, 0 + multichoice 17, 6, MULTI_FRONTIER_ITEM_CHOOSE, 0 switch VAR_RESULT case 0, BattleFrontier_BattlePyramidLobby_EventScript_250E40 case 1, BattleFrontier_BattlePyramidLobby_EventScript_250E50 case 2, BattleFrontier_BattlePyramidLobby_EventScript_250E60 - case 127, BattleFrontier_BattlePyramidLobby_EventScript_250E60 + case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250E60 end BattleFrontier_BattlePyramidLobby_EventScript_250E40:: @ 8250E40 @@ -562,14 +562,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E95:: @ 8250E95 BattleFrontier_BattlePyramidLobby_EventScript_250EA4:: @ 8250EA4 message BattleFrontier_BattlePyramidLobby_Text_2526D9 waitmessage - multichoice 15, 2, 101, 0 + multichoice 15, 2, MULTI_BATTLE_PYRAMID_RULES, 0 switch VAR_RESULT case 0, BattleFrontier_BattlePyramidLobby_EventScript_250EF7 case 1, BattleFrontier_BattlePyramidLobby_EventScript_250F05 case 2, BattleFrontier_BattlePyramidLobby_EventScript_250F13 case 3, BattleFrontier_BattlePyramidLobby_EventScript_250F21 case 4, BattleFrontier_BattlePyramidLobby_EventScript_250F2F - case 127, BattleFrontier_BattlePyramidLobby_EventScript_250F2F + case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250F2F end BattleFrontier_BattlePyramidLobby_EventScript_250EF7:: @ 8250EF7 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index 6e3f0c8fa..ce171e3c0 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -99,30 +99,30 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A - multichoice 19, 4, 103, 1 + multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40 case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA - case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A:: @ 8241D0A - multichoice 20, 6, 104, 1 + multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA - case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F BattleFrontier_BattleTowerBattleRoom_EventScript_241D40:: @ 8241D40 message BattleFrontier_BattleTowerBattleRoom_Text_2423A3 waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241D72 - case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72 call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4 @@ -138,11 +138,11 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA message BattleFrontier_BattleTowerBattleRoom_Text_24244C waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_24220E - case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC closemessage @@ -256,21 +256,21 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22 call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79 - multichoice 19, 4, 103, 1 + multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D40 case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA - case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79 - multichoice 20, 6, 104, 1 + multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA - case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF call BattleFrontier_BattleTowerBattleRoom_EventScript_242170 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index ecd7ac78a..07883c7ca 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -173,30 +173,30 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1 - multichoice 19, 4, 103, 1 + multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7 case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223 case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251 - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1:: @ 82491B1 - multichoice 20, 6, 104, 1 + multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223 case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251 - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7 message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3 waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249219 - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219 call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4 @@ -207,16 +207,16 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251 message BattleFrontier_BattleTowerBattleRoom2_Text_24244C waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283 closemessage @@ -350,20 +350,20 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412 BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417 goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249457 - multichoice 19, 6, 105, 1 + multichoice 19, 6, MULTI_GO_ON_RECORD_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483 case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8 case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD end BattleFrontier_BattleTowerBattleRoom2_EventScript_249457:: @ 8249457 - multichoice 20, 8, 106, 1 + multichoice 20, 8, MULTI_GO_ON_RETIRE, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483 case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD end BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483 @@ -381,10 +381,10 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483 BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8 message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3 waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4 setflag FLAG_TEMP_2 goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 @@ -393,7 +393,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8 BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD message BattleFrontier_BattleTowerBattleRoom2_Text_24244C waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 689c87993..888faa268 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -162,11 +162,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF message BattleFrontier_BattleTowerLobby_Text_23FE3C waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleTowerLobby_EventScript_23E8DF case 0, BattleFrontier_BattleTowerLobby_EventScript_23E8B4 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23E8DF + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23E8DF BattleFrontier_BattleArenaBattleRoom_EventScript_23E8B4:: @ 823E8B4 BattleFrontier_BattleArenaLobby_EventScript_23E8B4:: @ 823E8B4 @@ -244,21 +244,21 @@ BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936 BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948 message BattleFrontier_BattleTowerLobby_Text_2405B3 waitmessage - multichoice 17, 6, 23, 0 + multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23E984 case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA91 case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 setvar VAR_FRONTIER_BATTLE_MODE, 0 message BattleFrontier_BattleTowerLobby_Text_23FD3B waitmessage - multichoice 17, 6, 24, 0 + multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 @@ -324,21 +324,21 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA9F:: @ 823EA9F BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1 message BattleFrontier_BattleTowerLobby_Text_24085E waitmessage - multichoice 17, 6, 23, 0 + multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23EAED case 1, BattleFrontier_BattleTowerLobby_EventScript_23EBFA case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED setvar VAR_FRONTIER_BATTLE_MODE, 1 message BattleFrontier_BattleTowerLobby_Text_23FD3B waitmessage - multichoice 17, 6, 24, 0 + multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 @@ -405,21 +405,21 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08 BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D message BattleFrontier_BattleTowerLobby_Text_240B06 waitmessage - multichoice 17, 6, 23, 0 + multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23EC59 case 1, BattleFrontier_BattleTowerLobby_EventScript_23ED66 case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 setvar VAR_FRONTIER_BATTLE_MODE, 2 message BattleFrontier_BattleTowerLobby_Text_23FD3B waitmessage - multichoice 17, 6, 24, 0 + multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 @@ -485,21 +485,21 @@ BattleFrontier_BattleTowerLobby_EventScript_23ED74:: @ 823ED74 BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86 message BattleFrontier_BattleTowerLobby_Text_240E95 waitmessage - multichoice 17, 6, 23, 0 + multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23EDC2 case 1, BattleFrontier_BattleTowerLobby_EventScript_23F3DA case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 setvar VAR_FRONTIER_BATTLE_MODE, 3 message BattleFrontier_BattleTowerLobby_Text_23FD3B waitmessage - multichoice 17, 6, 24, 0 + multichoice 17, 6, MULTI_LEVEL_MODE, 0 switch VAR_RESULT case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 @@ -560,13 +560,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7 faceplayer message BattleFrontier_BattleTowerLobby_Text_23F8CD waitmessage - multichoice 16, 4, 109, 0 + multichoice 16, 4, MULTI_BATTLE_TOWER_FEELINGS, 0 switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23EF32 case 1, BattleFrontier_BattleTowerLobby_EventScript_23EF4C case 2, BattleFrontier_BattleTowerLobby_EventScript_23EF66 case 3, BattleFrontier_BattleTowerLobby_EventScript_23EF80 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23EF80 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23EF80 release end @@ -816,19 +816,19 @@ BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7 return BattleFrontier_BattleTowerLobby_EventScript_23F1D4:: @ 823F1D4 - bufferstdstring 0, 19 + bufferstdstring 0, STDSTRING_SINGLE return BattleFrontier_BattleTowerLobby_EventScript_23F1D9:: @ 823F1D9 - bufferstdstring 0, 20 + bufferstdstring 0, STDSTRING_DOUBLE return BattleFrontier_BattleTowerLobby_EventScript_23F1DE:: @ 823F1DE - bufferstdstring 0, 21 + bufferstdstring 0, STDSTRING_MULTI return BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3 - bufferstdstring 0, 22 + bufferstdstring 0, STDSTRING_MULTI_LINK return BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8 @@ -1022,12 +1022,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8 BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3 message BattleFrontier_BattleTowerLobby_Text_2792CD waitmessage - multichoice 16, 6, 81, 0 + multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F463 case 1, BattleFrontier_BattleTowerLobby_EventScript_23F430 case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 end BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430 @@ -1080,14 +1080,14 @@ BattleFrontier_BattleTowerLobby_EventScript_23F4BE:: @ 823F4BE BattleFrontier_BattleTowerLobby_EventScript_23F4CD:: @ 823F4CD message BattleFrontier_BattleTowerLobby_Text_241563 waitmessage - multichoice 17, 2, 97, 0 + multichoice 17, 2, MULTI_BATTLE_TOWER_RULES, 0 switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F520 case 1, BattleFrontier_BattleTowerLobby_EventScript_23F52E case 2, BattleFrontier_BattleTowerLobby_EventScript_23F53C case 3, BattleFrontier_BattleTowerLobby_EventScript_23F54A case 4, BattleFrontier_BattleTowerLobby_EventScript_23F558 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F558 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F558 end BattleFrontier_BattleTowerLobby_EventScript_23F520:: @ 823F520 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 130adde9d..29e14473d 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -86,7 +86,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A faceplayer message BattleFrontier_BattleTowerMultiBattleRoom_Text_244094 waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, MSGBOX_DEFAULT @@ -180,10 +180,10 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 setvar VAR_0x8005, 2 special sub_8161F74 waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 - case 127, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 setvar VAR_0x8004, 11 setvar VAR_0x8005, 3 special sub_8161F74 diff --git a/data/maps/BattleFrontier_Lounge2/scripts.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc index bc4880dd3..02dd09a52 100644 --- a/data/maps/BattleFrontier_Lounge2/scripts.inc +++ b/data/maps/BattleFrontier_Lounge2/scripts.inc @@ -55,43 +55,43 @@ BattleFrontier_Lounge2_EventScript_260701:: @ 8260701 return BattleFrontier_Lounge2_EventScript_26070A:: @ 826070A - bufferstdstring 0, 19 + bufferstdstring 0, STDSTRING_SINGLE return BattleFrontier_Lounge2_EventScript_26070F:: @ 826070F - bufferstdstring 0, 20 + bufferstdstring 0, STDSTRING_DOUBLE return BattleFrontier_Lounge2_EventScript_260714:: @ 8260714 - bufferstdstring 0, 21 + bufferstdstring 0, STDSTRING_MULTI return BattleFrontier_Lounge2_EventScript_260719:: @ 8260719 - bufferstdstring 0, 22 + bufferstdstring 0, STDSTRING_MULTI_LINK return BattleFrontier_Lounge2_EventScript_26071E:: @ 826071E - bufferstdstring 0, 24 + bufferstdstring 0, STDSTRING_BATTLE_DOME return BattleFrontier_Lounge2_EventScript_260723:: @ 8260723 - bufferstdstring 0, 25 + bufferstdstring 0, STDSTRING_BATTLE_FACTORY return BattleFrontier_Lounge2_EventScript_260728:: @ 8260728 - bufferstdstring 0, 26 + bufferstdstring 0, STDSTRING_BATTLE_PALACE return BattleFrontier_Lounge2_EventScript_26072D:: @ 826072D - bufferstdstring 0, 27 + bufferstdstring 0, STDSTRING_BATTLE_ARENA return BattleFrontier_Lounge2_EventScript_260732:: @ 8260732 - bufferstdstring 0, 28 + bufferstdstring 0, STDSTRING_BATTLE_PIKE return BattleFrontier_Lounge2_EventScript_260737:: @ 8260737 - bufferstdstring 0, 29 + bufferstdstring 0, STDSTRING_BATTLE_PYRAMID return BattleFrontier_Lounge2_EventScript_26073C:: @ 826073C diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 73da6194e..3be247099 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -30,14 +30,14 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF end BattleFrontier_Lounge3_EventScript_261DE9:: @ 8261DE9 - multichoice 20, 4, 87, 0 + multichoice 20, 4, MULTI_FRONTIER_GAMBLER_BET, 0 copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT switch VAR_RESULT case FRONTIER_GAMBLER_BET_5, BattleFrontier_Lounge3_EventScript_261E30 case FRONTIER_GAMBLER_BET_10, BattleFrontier_Lounge3_EventScript_261E3B case FRONTIER_GAMBLER_BET_15, BattleFrontier_Lounge3_EventScript_261E46 case FRONTIER_GAMBLER_BET_CANCEL, BattleFrontier_Lounge3_EventScript_261FAF - case 127, BattleFrontier_Lounge3_EventScript_261FAF + case MULTI_B_PRESSED, BattleFrontier_Lounge3_EventScript_261FAF end BattleFrontier_Lounge3_EventScript_261E30:: @ 8261E30 diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc index 5b3f88dcf..82b04023f 100644 --- a/data/maps/BattleFrontier_Lounge7/scripts.inc +++ b/data/maps/BattleFrontier_Lounge7/scripts.inc @@ -38,7 +38,7 @@ BattleFrontier_Lounge7_EventScript_265284:: @ 8265284 case 8, BattleFrontier_Lounge7_EventScript_26542F case 9, BattleFrontier_Lounge7_EventScript_26543A case 10, BattleFrontier_Lounge7_EventScript_265635 - case 127, BattleFrontier_Lounge7_EventScript_265635 + case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635 end BattleFrontier_Lounge7_EventScript_26532F:: @ 826532F @@ -62,7 +62,7 @@ BattleFrontier_Lounge7_EventScript_26532F:: @ 826532F case 8, BattleFrontier_Lounge7_EventScript_26542F case 9, BattleFrontier_Lounge7_EventScript_26543A case 10, BattleFrontier_Lounge7_EventScript_265635 - case 127, BattleFrontier_Lounge7_EventScript_265635 + case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635 end BattleFrontier_Lounge7_EventScript_2653D7:: @ 82653D7 @@ -152,7 +152,7 @@ BattleFrontier_Lounge7_EventScript_265474:: @ 8265474 case 8, BattleFrontier_Lounge7_EventScript_26561F case 9, BattleFrontier_Lounge7_EventScript_26562A case 10, BattleFrontier_Lounge7_EventScript_265635 - case 127, BattleFrontier_Lounge7_EventScript_265635 + case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635 end BattleFrontier_Lounge7_EventScript_26551F:: @ 826551F @@ -176,7 +176,7 @@ BattleFrontier_Lounge7_EventScript_26551F:: @ 826551F case 8, BattleFrontier_Lounge7_EventScript_26561F case 9, BattleFrontier_Lounge7_EventScript_26562A case 10, BattleFrontier_Lounge7_EventScript_265635 - case 127, BattleFrontier_Lounge7_EventScript_265635 + case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_265635 end BattleFrontier_Lounge7_EventScript_2655C7:: @ 82655C7 diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index 2d2bdb1c0..fb96172d2 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -20,12 +20,12 @@ BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0 end BattleFrontier_OutsideWest_EventScript_23D416:: @ 823D416 - multichoicedefault 18, 6, 53, 2, 0 + multichoicedefault 18, 6, MULTI_SSTIDAL_BATTLE_FRONTIER, 2, 0 switch VAR_RESULT case 0, BattleFrontier_OutsideWest_EventScript_23D458 case 1, BattleFrontier_OutsideWest_EventScript_23D483 case 2, BattleFrontier_OutsideWest_EventScript_23D4D8 - case 127, BattleFrontier_OutsideWest_EventScript_23D4D8 + case MULTI_B_PRESSED, BattleFrontier_OutsideWest_EventScript_23D4D8 end BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index f342655dc..3eac4655b 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -150,7 +150,7 @@ BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320 case 7, BattleFrontier_ReceptionGate_EventScript_266410 case 8, BattleFrontier_ReceptionGate_EventScript_26641E case 9, BattleFrontier_ReceptionGate_EventScript_26642C - case 127, BattleFrontier_ReceptionGate_EventScript_26642C + case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_26642C end BattleFrontier_ReceptionGate_EventScript_2663AE:: @ 82663AE @@ -213,7 +213,7 @@ BattleFrontier_ReceptionGate_EventScript_266436:: @ 8266436 BattleFrontier_ReceptionGate_EventScript_266446:: @ 8266446 message BattleFrontier_ReceptionGate_Text_266EE0 waitmessage - multichoice 15, 0, 95, 0 + multichoice 15, 0, MULTI_FRONTIER_RULES, 0 switch VAR_RESULT case 0, BattleFrontier_ReceptionGate_EventScript_2664A4 case 1, BattleFrontier_ReceptionGate_EventScript_2664B2 @@ -221,7 +221,7 @@ BattleFrontier_ReceptionGate_EventScript_266446:: @ 8266446 case 3, BattleFrontier_ReceptionGate_EventScript_2664CE case 4, BattleFrontier_ReceptionGate_EventScript_2664DC case 5, BattleFrontier_ReceptionGate_EventScript_2664EA - case 127, BattleFrontier_ReceptionGate_EventScript_2664EA + case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_2664EA end BattleFrontier_ReceptionGate_EventScript_2664A4:: @ 82664A4 @@ -264,13 +264,13 @@ BattleFrontier_ReceptionGate_EventScript_2664F4:: @ 82664F4 BattleFrontier_ReceptionGate_EventScript_266504:: @ 8266504 message BattleFrontier_ReceptionGate_Text_26737C waitmessage - multichoice 16, 4, 11, 0 + multichoice 16, 4, MULTI_FRONTIER_PASS_INFO, 0 switch VAR_RESULT case 0, BattleFrontier_ReceptionGate_EventScript_26654C case 1, BattleFrontier_ReceptionGate_EventScript_26655A case 2, BattleFrontier_ReceptionGate_EventScript_266568 case 3, BattleFrontier_ReceptionGate_EventScript_266576 - case 127, BattleFrontier_ReceptionGate_EventScript_266576 + case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_266576 end BattleFrontier_ReceptionGate_EventScript_26654C:: @ 826654C diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 5f850ed7b..9ef54cdc8 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -4,10 +4,10 @@ BirthIsland_Harbor_MapScripts:: @ 826805C BirthIsland_Harbor_EventScript_26805D:: @ 826805D lock faceplayer - msgbox BirthIsland_Harbor_Text_2C6B90, MSGBOX_YESNO + msgbox BirthIsland_Harbor_Text_SailorReturn, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq BirthIsland_Harbor_EventScript_2680A2 - msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT + msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 @@ -21,7 +21,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D end BirthIsland_Harbor_EventScript_2680A2:: @ 82680A2 - msgbox BirthIsland_Harbor_Text_2A6A82, MSGBOX_DEFAULT + msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT release end diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index 5148d2942..3b130e756 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -22,7 +22,7 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9 goto CaveOfOrigin_B1F_EventScript_2357F0 CaveOfOrigin_B1F_EventScript_2357F0:: @ 82357F0 - multichoice 0, 0, 110, 0 + multichoice 0, 0, MULTI_WHERES_RAYQUAZA, 0 switch VAR_RESULT case 0, CaveOfOrigin_B1F_EventScript_23582C case 1, CaveOfOrigin_B1F_EventScript_235837 diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 2461ddbf5..ac0155df9 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -12,12 +12,12 @@ DewfordTown_EventScript_1E9511:: @ 81E9511 goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_1E9585 message DewfordTown_Text_1E9C8A waitmessage - multichoicedefault 21, 6, 0, 2, 0 + multichoicedefault 21, 6, MULTI_BRINEY_ON_DEWFORD, 2, 0 switch VAR_RESULT case 0, DewfordTown_EventScript_1E955A case 1, DewfordTown_EventScript_1E956A case 2, DewfordTown_EventScript_1E957A - case 127, DewfordTown_EventScript_1E957A + case MULTI_B_PRESSED, DewfordTown_EventScript_1E957A end DewfordTown_EventScript_1E955A:: @ 81E955A @@ -97,7 +97,7 @@ DewfordTown_EventScript_1E9620:: @ 81E9620 DewfordTown_EventScript_1E962A:: @ 81E962A message DewfordTown_Text_1E9FB8 waitmessage - multichoice 20, 8, 50, 1 + multichoice 20, 8, MULTI_HOWS_FISHING, 1 compare VAR_RESULT, 0 goto_if_eq DewfordTown_EventScript_1E964C compare VAR_RESULT, 1 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index 7501f6e8d..b63846abd 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -120,7 +120,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B43 compare VAR_RESULT, 2 call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B4A - multichoice 20, 6, 104, 1 + multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT case 0, FallarborTown_BattleTentBattleRoom_EventScript_200AD8 case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A78 @@ -136,11 +136,11 @@ FallarborTown_BattleTentBattleRoom_EventScript_200A78:: @ 8200A78 FallarborTown_BattleTentBattleRoom_EventScript_200AA6:: @ 8200AA6 message FallarborTown_BattleTentBattleRoom_Text_257E9E waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A2A case 0, FallarborTown_BattleTentBattleRoom_EventScript_20097E - case 127, FallarborTown_BattleTentBattleRoom_EventScript_200A2A + case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_200A2A FallarborTown_BattleTentBattleRoom_EventScript_200AD8:: @ 8200AD8 closemessage diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 56039e5c8..3f6eec374 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -140,12 +140,12 @@ FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001 FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021 message FallarborTown_BattleTentLobby_Text_2C4843 waitmessage - multichoice 17, 6, 23, 0 + multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT case 0, FallarborTown_BattleTentLobby_EventScript_20005D case 1, FallarborTown_BattleTentLobby_EventScript_200169 case 2, FallarborTown_BattleTentLobby_EventScript_2001C5 - case 127, FallarborTown_BattleTentLobby_EventScript_2001C5 + case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_2001C5 FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D setvar VAR_FRONTIER_FACILITY, 3 @@ -315,7 +315,7 @@ FallarborTown_BattleTentLobby_EventScript_20024F:: @ 820024F FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E message FallarborTown_BattleTentLobby_Text_256DDF waitmessage - multichoice 17, 0, 112, 0 + multichoice 17, 0, MULTI_FALLARBOR_TENT_RULES, 0 switch VAR_RESULT case 0, FallarborTown_BattleTentLobby_EventScript_2002BC case 1, FallarborTown_BattleTentLobby_EventScript_2002CA @@ -323,7 +323,7 @@ FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E case 3, FallarborTown_BattleTentLobby_EventScript_2002E6 case 4, FallarborTown_BattleTentLobby_EventScript_2002F4 case 5, FallarborTown_BattleTentLobby_EventScript_200302 - case 127, FallarborTown_BattleTentLobby_EventScript_200302 + case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_200302 end FallarborTown_BattleTentLobby_EventScript_2002BC:: @ 82002BC diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index bd91918c3..e0d54233b 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -19,10 +19,10 @@ FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 lock faceplayer - msgbox FarawayIsland_Entrance_Text_2C6B42, MSGBOX_YESNO + msgbox FarawayIsland_Entrance_Text_SailorReturn, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq FarawayIsland_Entrance_EventScript_267CE7 - msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT + msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 @@ -36,11 +36,11 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 end FarawayIsland_Entrance_EventScript_267CE7:: @ 8267CE7 - msgbox FarawayIsland_Entrance_Text_2A6A82, MSGBOX_DEFAULT + msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT release end FarawayIsland_Entrance_EventScript_267CF1:: @ 8267CF1 - msgbox FarawayIsland_Entrance_Text_2C6D5A, MSGBOX_SIGN + msgbox FarawayIsland_Entrance_Text_Sign, MSGBOX_SIGN end diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index f8394f161..9bbf0575d 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -122,7 +122,7 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 waitmovement 0 setvar VAR_0x8004, 0 special sub_81D4A90 - message FarawayIsland_Interior_Text_2C6DFF + message FarawayIsland_Interior_Text_Mew waitse playmoncry SPECIES_MEW, 2 compare VAR_FACING, 2 diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 34344bca3..14ab157ed 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -7,15 +7,15 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_21786E call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_217862 msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT - multichoice 21, 8, 54, 1 + multichoice 21, 8, MULTI_RIGHTLEFT, 1 switch VAR_RESULT case 1, FortreeCity_House2_EventScript_217878 msgbox FortreeCity_House2_Text_21796A, MSGBOX_DEFAULT - multichoice 21, 8, 54, 1 + multichoice 21, 8, MULTI_RIGHTLEFT, 1 switch VAR_RESULT case 1, FortreeCity_House2_EventScript_217878 msgbox FortreeCity_House2_Text_2179C9, MSGBOX_DEFAULT - multichoice 21, 8, 54, 1 + multichoice 21, 8, MULTI_RIGHTLEFT, 1 switch VAR_RESULT case 0, FortreeCity_House2_EventScript_217878 msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 10978b785..a5ab9601c 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -630,12 +630,12 @@ LilycoveCity_ContestLobby_EventScript_21A806:: @ 821A806 LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819 message LilycoveCity_ContestLobby_Text_27C0F6 waitmessage - multichoice 0, 0, 2, 0 + multichoice 0, 0, MULTI_ENTERINFO, 0 switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_21A856 case 1, LilycoveCity_ContestLobby_EventScript_21A90D case 2, LilycoveCity_ContestLobby_EventScript_21A97F - case 127, LilycoveCity_ContestLobby_EventScript_21A97F + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F end LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 @@ -648,12 +648,12 @@ LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 message LilycoveCity_ContestLobby_Text_27C8FD waitmessage specialvar VAR_TEMP_D, IsWirelessAdapterConnected - multichoice 0, 0, 85, 0 + multichoice 0, 0, MULTI_LINK_CONTEST_MODE, 0 switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_21A8BB case 1, LilycoveCity_ContestLobby_EventScript_21A8C6 case 2, LilycoveCity_ContestLobby_EventScript_21A97F - case 127, LilycoveCity_ContestLobby_EventScript_21A97F + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F end LilycoveCity_ContestLobby_EventScript_21A8BB:: @ 821A8BB @@ -671,10 +671,10 @@ LilycoveCity_ContestLobby_EventScript_21A8C6:: @ 821A8C6 LilycoveCity_ContestLobby_EventScript_21A8DC:: @ 821A8DC message LilycoveCity_ContestLobby_Text_27C119 waitmessage - multichoice 0, 0, 4, 0 + multichoice 0, 0, MULTI_CONTEST_TYPE, 0 switch VAR_RESULT case 5, LilycoveCity_ContestLobby_EventScript_21A97F - case 127, LilycoveCity_ContestLobby_EventScript_21A97F + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F copyvar VAR_CONTEST_CATEGORY, VAR_RESULT goto LilycoveCity_ContestLobby_EventScript_21A98C end @@ -682,13 +682,13 @@ LilycoveCity_ContestLobby_EventScript_21A8DC:: @ 821A8DC LilycoveCity_ContestLobby_EventScript_21A90D:: @ 821A90D message LilycoveCity_ContestLobby_Text_27C0DA waitmessage - multichoice 0, 0, 84, 0 + multichoice 0, 0, MULTI_LINK_CONTEST_INFO, 0 switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_21A955 case 1, LilycoveCity_ContestLobby_EventScript_21A963 case 2, LilycoveCity_ContestLobby_EventScript_21A971 case 3, LilycoveCity_ContestLobby_EventScript_21A819 - case 127, LilycoveCity_ContestLobby_EventScript_21A819 + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A819 end LilycoveCity_ContestLobby_EventScript_21A955:: @ 821A955 @@ -877,12 +877,12 @@ LilycoveCity_ContestLobby_EventScript_21ABA0:: @ 821ABA0 LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6 message Text_DecideLinkLeader waitmessage - multichoice 16, 6, 81, 0 + multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_21AC0B case 1, LilycoveCity_ContestLobby_EventScript_21ABE3 case 2, LilycoveCity_ContestLobby_EventScript_21A97F - case 127, LilycoveCity_ContestLobby_EventScript_21A97F + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F end LilycoveCity_ContestLobby_EventScript_21ABE3:: @ 821ABE3 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index 70de434a8..83a43a5b6 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -21,27 +21,27 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624 end LilycoveCity_DepartmentStoreElevator_EventScript_220689:: @ 8220689 - multichoicedefault 0, 0, 57, 0, 0 + multichoicedefault 0, 0, MULTI_FLOORS, 0, 0 goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 end LilycoveCity_DepartmentStoreElevator_EventScript_220695:: @ 8220695 - multichoicedefault 0, 0, 57, 1, 0 + multichoicedefault 0, 0, MULTI_FLOORS, 1, 0 goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 end LilycoveCity_DepartmentStoreElevator_EventScript_2206A1:: @ 82206A1 - multichoicedefault 0, 0, 57, 2, 0 + multichoicedefault 0, 0, MULTI_FLOORS, 2, 0 goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 end LilycoveCity_DepartmentStoreElevator_EventScript_2206AD:: @ 82206AD - multichoicedefault 0, 0, 57, 3, 0 + multichoicedefault 0, 0, MULTI_FLOORS, 3, 0 goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 end LilycoveCity_DepartmentStoreElevator_EventScript_2206B9:: @ 82206B9 - multichoicedefault 0, 0, 57, 4, 0 + multichoicedefault 0, 0, MULTI_FLOORS, 4, 0 goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 end @@ -53,7 +53,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5 case 3, LilycoveCity_DepartmentStoreElevator_EventScript_220740 case 4, LilycoveCity_DepartmentStoreElevator_EventScript_220718 case 5, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 - case 127, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + case MULTI_B_PRESSED, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 end LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 8515d265c..654395dde 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -76,7 +76,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220295:: @ 8220295 end LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6:: @ 82202A6 - multichoice 16, 0, 42, 0 + multichoice 16, 0, MULTI_VENDING_MACHINE, 0 copyvar VAR_TEMP_1, VAR_RESULT switch VAR_TEMP_1 case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4 @@ -149,7 +149,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 - bufferstdstring 2, 14 + bufferstdstring 2, STDSTRING_ITEMS msgbox gText_PutItemInPocket, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 @@ -161,7 +161,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 - bufferstdstring 2, 14 + bufferstdstring 2, STDSTRING_ITEMS msgbox gText_PutItemInPocket, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 @@ -173,7 +173,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 - bufferstdstring 2, 14 + bufferstdstring 2, STDSTRING_ITEMS msgbox gText_PutItemInPocket, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436 end diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index 28e2366e6..1b97c298d 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_Harbor_EventScript_21E00F", + "script": "LilycoveCity_Harbor_EventScript_FerryAttendant", "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_Harbor_EventScript_21E637", + "script": "LilycoveCity_Harbor_EventScript_Sailor", "flag": "0" }, { @@ -77,7 +77,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER" + "flag": "FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER" } ], "warp_events": [ diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 4b446c39b..292180d31 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -6,106 +6,107 @@ LilycoveCity_Harbor_OnTransition: @ 821E006 setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33 end -LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F +LilycoveCity_Harbor_EventScript_FerryAttendant:: @ 821E00F lock faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_21E54D - call LilycoveCity_Harbor_EventScript_21E194 - call LilycoveCity_Harbor_EventScript_21E1C6 - call LilycoveCity_Harbor_EventScript_21E1F8 - call LilycoveCity_Harbor_EventScript_21E22A - call LilycoveCity_Harbor_EventScript_21E25C - call LilycoveCity_Harbor_EventScript_21E2A6 + goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_FerryUnavailable + call LilycoveCity_Harbor_EventScript_GetEonTicketState + call LilycoveCity_Harbor_EventScript_GetAuroraTicketState + call LilycoveCity_Harbor_EventScript_GetOldSeaMapState + call LilycoveCity_Harbor_EventScript_GetMysticTicketState + call LilycoveCity_Harbor_EventScript_GetFirstTimeShowingTicket + call LilycoveCity_Harbor_EventScript_GetHasTicketsState compare VAR_TEMP_C, 2 - goto_if_eq LilycoveCity_Harbor_EventScript_21E350 + goto_if_eq LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime compare VAR_TEMP_B, 1 - goto_if_eq LilycoveCity_Harbor_EventScript_21E2F0 + goto_if_eq LilycoveCity_Harbor_EventScript_EonTicketFirstTime compare VAR_TEMP_B, 2 - goto_if_eq LilycoveCity_Harbor_EventScript_21E320 + goto_if_eq LilycoveCity_Harbor_EventScript_AuroraTicketFirstTime compare VAR_TEMP_B, 4 - goto_if_eq LilycoveCity_Harbor_EventScript_21E350 - compare VAR_TEMP_B, 8 - goto_if_eq LilycoveCity_Harbor_EventScript_21E41D + goto_if_eq LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime + compare VAR_TEMP_B, 8 + goto_if_eq LilycoveCity_Harbor_EventScript_MysticTicketFirstTime compare VAR_TEMP_B, 0 - goto_if_ne LilycoveCity_Harbor_EventScript_21E44D - goto LilycoveCity_Harbor_EventScript_21E080 + goto_if_ne LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime + goto LilycoveCity_Harbor_EventScript_NoFirstTimeEventTickets end -LilycoveCity_Harbor_EventScript_21E080:: @ 821E080 +@ First goto_if_eq is unnecessary; identical scripts +LilycoveCity_Harbor_EventScript_NoFirstTimeEventTickets:: @ 821E080 compare VAR_TEMP_A, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_21E557 - msgbox LilycoveCity_Harbor_Text_21E758, MSGBOX_DEFAULT - message LilycoveCity_Harbor_Text_21E7ED + goto_if_eq LilycoveCity_Harbor_EventScript_NoEventTickets + msgbox LilycoveCity_Harbor_Text_MayISeeYourTicket, MSGBOX_DEFAULT + message LilycoveCity_Harbor_Text_FlashTicketWhereTo waitmessage - goto LilycoveCity_Harbor_EventScript_21E09F + goto LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect end -LilycoveCity_Harbor_EventScript_21E09F:: @ 821E09F +LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect:: @ 821E09F setvar VAR_0x8004, 0 - special sub_80E2548 + special ScriptMenu_CreateLilycoveSSTidalMultichoice waitstate - special sub_80E2878 + special GetLilycoveSSTidalSelection switch VAR_RESULT - case 0, LilycoveCity_Harbor_EventScript_21E149 - case 1, LilycoveCity_Harbor_EventScript_21E171 - case 2, LilycoveCity_Harbor_EventScript_21E109 - case 3, LilycoveCity_Harbor_EventScript_21E119 - case 4, LilycoveCity_Harbor_EventScript_21E129 - case 5, LilycoveCity_Harbor_EventScript_21E139 - case 6, LilycoveCity_Harbor_EventScript_21E626 - case 127, LilycoveCity_Harbor_EventScript_21E626 + case 0, LilycoveCity_Harbor_EventScript_GoToSlateport + case 1, LilycoveCity_Harbor_EventScript_GoToBattleFrontier + case 2, LilycoveCity_Harbor_EventScript_GoToSouthernIsland + case 3, LilycoveCity_Harbor_EventScript_GoToNavelRock + case 4, LilycoveCity_Harbor_EventScript_GoToBirthIsland + case 5, LilycoveCity_Harbor_EventScript_GoToFarawayIsland + case 6, LilycoveCity_Harbor_EventScript_ExitSailSelect + case MULTI_B_PRESSED, LilycoveCity_Harbor_EventScript_ExitSailSelect end -LilycoveCity_Harbor_EventScript_21E109:: @ 821E109 - call LilycoveCity_Harbor_EventScript_21E5CC +LilycoveCity_Harbor_EventScript_GoToSouthernIsland:: @ 821E109 + call LilycoveCity_Harbor_EventScript_BoardFerry warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate release end -LilycoveCity_Harbor_EventScript_21E119:: @ 821E119 - call LilycoveCity_Harbor_EventScript_21E5CC +LilycoveCity_Harbor_EventScript_GoToNavelRock:: @ 821E119 + call LilycoveCity_Harbor_EventScript_BoardFerry warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4 waitstate release end -LilycoveCity_Harbor_EventScript_21E129:: @ 821E129 - call LilycoveCity_Harbor_EventScript_21E5CC +LilycoveCity_Harbor_EventScript_GoToBirthIsland:: @ 821E129 + call LilycoveCity_Harbor_EventScript_BoardFerry warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4 waitstate release end -LilycoveCity_Harbor_EventScript_21E139:: @ 821E139 - call LilycoveCity_Harbor_EventScript_21E5CC +LilycoveCity_Harbor_EventScript_GoToFarawayIsland:: @ 821E139 + call LilycoveCity_Harbor_EventScript_BoardFerry warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 waitstate release end -LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 - msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO +LilycoveCity_Harbor_EventScript_GoToSlateport:: @ 821E149 + msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 + goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind setvar VAR_PORTHOLE_STATE, 5 - call LilycoveCity_Harbor_EventScript_21E5CC + call LilycoveCity_Harbor_EventScript_BoardFerry warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end -LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 - msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO +LilycoveCity_Harbor_EventScript_GoToBattleFrontier:: @ 821E171 + msgbox LilycoveCity_Harbor_Text_BattleFrontierItIs, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 - call LilycoveCity_Harbor_EventScript_21E5CC + goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind + call LilycoveCity_Harbor_EventScript_BoardFerry warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate release end -LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 +LilycoveCity_Harbor_EventScript_GetEonTicketState:: @ 821E194 setvar VAR_TEMP_E, 0 goto_if_unset FLAG_SYS_HAS_EON_TICKET, Common_EventScript_NopReturn checkitem ITEM_EON_TICKET, 1 @@ -116,7 +117,7 @@ LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 setvar VAR_TEMP_E, 2 return -LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 +LilycoveCity_Harbor_EventScript_GetAuroraTicketState:: @ 821E1C6 setvar VAR_TEMP_D, 0 goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, Common_EventScript_NopReturn checkitem ITEM_AURORA_TICKET, 1 @@ -127,7 +128,7 @@ LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 setvar VAR_TEMP_D, 2 return -LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 +LilycoveCity_Harbor_EventScript_GetOldSeaMapState:: @ 821E1F8 setvar VAR_TEMP_C, 0 goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, Common_EventScript_NopReturn checkitem ITEM_OLD_SEA_MAP, 1 @@ -138,7 +139,7 @@ LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 setvar VAR_TEMP_C, 2 return -LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A +LilycoveCity_Harbor_EventScript_GetMysticTicketState:: @ 821E22A setvar VAR_TEMP_9, 0 goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, Common_EventScript_NopReturn checkitem ITEM_MYSTIC_TICKET, 1 @@ -149,102 +150,102 @@ LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A setvar VAR_TEMP_9, 2 return -LilycoveCity_Harbor_EventScript_21E25C:: @ 821E25C +LilycoveCity_Harbor_EventScript_GetFirstTimeShowingTicket:: @ 821E25C setvar VAR_TEMP_B, 0 compare VAR_TEMP_E, 2 - call_if_eq LilycoveCity_Harbor_EventScript_21E28E + call_if_eq LilycoveCity_Harbor_EventScript_SetFirstTimeShowingEonTicket compare VAR_TEMP_D, 2 - call_if_eq LilycoveCity_Harbor_EventScript_21E294 + call_if_eq LilycoveCity_Harbor_EventScript_SetFirstTimeShowingAuroraTicket compare VAR_TEMP_C, 2 - call_if_eq LilycoveCity_Harbor_EventScript_21E29A + call_if_eq LilycoveCity_Harbor_EventScript_SetFirstTimeShowingOldSeaMap compare VAR_TEMP_9, 2 - call_if_eq LilycoveCity_Harbor_EventScript_21E2A0 + call_if_eq LilycoveCity_Harbor_EventScript_SetFirstTimeShowingMysticTicket return -LilycoveCity_Harbor_EventScript_21E28E:: @ 821E28E +LilycoveCity_Harbor_EventScript_SetFirstTimeShowingEonTicket:: @ 821E28E addvar VAR_TEMP_B, 1 return -LilycoveCity_Harbor_EventScript_21E294:: @ 821E294 +LilycoveCity_Harbor_EventScript_SetFirstTimeShowingAuroraTicket:: @ 821E294 addvar VAR_TEMP_B, 2 return -LilycoveCity_Harbor_EventScript_21E29A:: @ 821E29A +LilycoveCity_Harbor_EventScript_SetFirstTimeShowingOldSeaMap:: @ 821E29A addvar VAR_TEMP_B, 4 return -LilycoveCity_Harbor_EventScript_21E2A0:: @ 821E2A0 +LilycoveCity_Harbor_EventScript_SetFirstTimeShowingMysticTicket:: @ 821E2A0 addvar VAR_TEMP_B, 8 return -LilycoveCity_Harbor_EventScript_21E2A6:: @ 821E2A6 +LilycoveCity_Harbor_EventScript_GetHasTicketsState:: @ 821E2A6 setvar VAR_TEMP_A, 0 compare VAR_TEMP_E, 1 - call_if_eq LilycoveCity_Harbor_EventScript_21E2D8 + call_if_eq LilycoveCity_Harbor_EventScript_SetHasEonTicket compare VAR_TEMP_D, 1 - call_if_eq LilycoveCity_Harbor_EventScript_21E2DE + call_if_eq LilycoveCity_Harbor_EventScript_SetHasAuroraTicket compare VAR_TEMP_C, 1 - call_if_eq LilycoveCity_Harbor_EventScript_21E2E4 + call_if_eq LilycoveCity_Harbor_EventScript_SetHasOldSeaMap compare VAR_TEMP_9, 1 - call_if_eq LilycoveCity_Harbor_EventScript_21E2EA + call_if_eq LilycoveCity_Harbor_EventScript_SetHasMysticTicket return -LilycoveCity_Harbor_EventScript_21E2D8:: @ 821E2D8 +LilycoveCity_Harbor_EventScript_SetHasEonTicket:: @ 821E2D8 addvar VAR_TEMP_A, 1 return -LilycoveCity_Harbor_EventScript_21E2DE:: @ 821E2DE +LilycoveCity_Harbor_EventScript_SetHasAuroraTicket:: @ 821E2DE addvar VAR_TEMP_A, 2 return -LilycoveCity_Harbor_EventScript_21E2E4:: @ 821E2E4 +LilycoveCity_Harbor_EventScript_SetHasOldSeaMap:: @ 821E2E4 addvar VAR_TEMP_A, 4 return -LilycoveCity_Harbor_EventScript_21E2EA:: @ 821E2EA +LilycoveCity_Harbor_EventScript_SetHasMysticTicket:: @ 821E2EA addvar VAR_TEMP_A, 8 return -LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0 +LilycoveCity_Harbor_EventScript_EonTicketFirstTime:: @ 821E2F0 setflag FLAG_HAS_EON_TICKET - msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT + msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT closemessage - call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2A68FC, MSGBOX_DEFAULT - goto LilycoveCity_Harbor_EventScript_21E30F + call LilycoveCity_Harbor_EventScript_GetEventTicketSailor + msgbox EventTicket_Text_ShowEonTicket, MSGBOX_DEFAULT + goto LilycoveCity_Harbor_EventScript_GoToSouthernIslandFirstTime end -LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F +LilycoveCity_Harbor_EventScript_GoToSouthernIslandFirstTime:: @ 821E30F closemessage - call LilycoveCity_Harbor_EventScript_21E514 + call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate release end -LilycoveCity_Harbor_EventScript_21E320:: @ 821E320 +LilycoveCity_Harbor_EventScript_AuroraTicketFirstTime:: @ 821E320 setflag FLAG_HAS_AURORA_TICKET - msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT + msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT closemessage - call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C6A71, MSGBOX_DEFAULT - goto LilycoveCity_Harbor_EventScript_21E33F + call LilycoveCity_Harbor_EventScript_GetEventTicketSailor + msgbox EventTicket_Text_OddTicketGetOnBoard, MSGBOX_DEFAULT + goto LilycoveCity_Harbor_EventScript_GoToBirthIslandFirstTime end -LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F +LilycoveCity_Harbor_EventScript_GoToBirthIslandFirstTime:: @ 821E33F closemessage - call LilycoveCity_Harbor_EventScript_21E514 + call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4 waitstate release end -LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 +LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime:: @ 821E350 setflag FLAG_HAS_OLD_SEA_MAP - msgbox LilycoveCity_Harbor_Text_2A6848, MSGBOX_DEFAULT + msgbox EventTicket_Text_ShowOldSeaMap, MSGBOX_DEFAULT closemessage - call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C68A5, MSGBOX_DEFAULT + call LilycoveCity_Harbor_EventScript_GetEventTicketSailor + msgbox EventTicket_Text_OldSeaMapTooFar, MSGBOX_DEFAULT closemessage applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 @@ -253,80 +254,80 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 waitmovement 0 applymovement 4, Common_Movement_Delay48 waitmovement 0 - compare VAR_FACING, 2 - call_if_eq LilycoveCity_Harbor_EventScript_21E656 - compare VAR_FACING, 4 - call_if_eq LilycoveCity_Harbor_EventScript_21E661 + compare VAR_FACING, DIR_NORTH + call_if_eq LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayNorth + compare VAR_FACING, DIR_EAST + call_if_eq LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayEast addobject 5 - compare VAR_FACING, 2 - call_if_eq LilycoveCity_Harbor_EventScript_21E675 - compare VAR_FACING, 4 - call_if_eq LilycoveCity_Harbor_EventScript_21E680 - msgbox LilycoveCity_Harbor_Text_2C6951, MSGBOX_DEFAULT - compare VAR_FACING, 2 - call_if_eq LilycoveCity_Harbor_EventScript_21E68B - compare VAR_FACING, 4 - call_if_eq LilycoveCity_Harbor_EventScript_21E696 - msgbox LilycoveCity_Harbor_Text_2C69AA, MSGBOX_DEFAULT + compare VAR_FACING, DIR_NORTH + call_if_eq LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth + compare VAR_FACING, DIR_EAST + call_if_eq LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast + msgbox EventTicket_Text_BrineyHoldOnASecond, MSGBOX_DEFAULT + compare VAR_FACING, DIR_NORTH + call_if_eq LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth + compare VAR_FACING, DIR_EAST + call_if_eq LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast + msgbox EventTicket_Text_BrineyLetsSail, MSGBOX_DEFAULT closemessage - compare VAR_FACING, 2 - call_if_eq LilycoveCity_Harbor_EventScript_21E6A1 - compare VAR_FACING, 4 - call_if_eq LilycoveCity_Harbor_EventScript_21E6BA + compare VAR_FACING, DIR_NORTH + call_if_eq LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorNorth + compare VAR_FACING, DIR_EAST + call_if_eq LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorEast setvar VAR_0x8004, 2 - call LilycoveCity_Harbor_EventScript_2721E2 + call Common_EventScript_FerryDepart warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 waitstate release end -LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C +LilycoveCity_Harbor_EventScript_GoToFarawayIslandFirstTime:: @ 821E40C closemessage - call LilycoveCity_Harbor_EventScript_21E514 + call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 waitstate release end -LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D +LilycoveCity_Harbor_EventScript_MysticTicketFirstTime:: @ 821E41D setflag FLAG_HAS_MYSTIC_TICKET - msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT + msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT closemessage - call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C6A71, MSGBOX_DEFAULT - goto LilycoveCity_Harbor_EventScript_21E43C + call LilycoveCity_Harbor_EventScript_GetEventTicketSailor + msgbox EventTicket_Text_OddTicketGetOnBoard, MSGBOX_DEFAULT + goto LilycoveCity_Harbor_EventScript_GoToNavelRockFirstTime end -LilycoveCity_Harbor_EventScript_21E43C:: @ 821E43C +LilycoveCity_Harbor_EventScript_GoToNavelRockFirstTime:: @ 821E43C closemessage - call LilycoveCity_Harbor_EventScript_21E514 + call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4 waitstate release end -LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D - msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT +LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime:: @ 821E44D + msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT closemessage - call LilycoveCity_Harbor_EventScript_21E4EE - message LilycoveCity_Harbor_Text_2C6BD4 + call LilycoveCity_Harbor_EventScript_GetEventTicketSailor + message EventTicket_Text_OddTicketsWhereTo waitmessage setvar VAR_0x8004, 1 - special sub_80E2548 + special ScriptMenu_CreateLilycoveSSTidalMultichoice waitstate - special sub_80E2878 + special GetLilycoveSSTidalSelection switch VAR_RESULT - case 2, LilycoveCity_Harbor_EventScript_21E30F - case 3, LilycoveCity_Harbor_EventScript_21E43C - case 4, LilycoveCity_Harbor_EventScript_21E33F - case 5, LilycoveCity_Harbor_EventScript_21E40C - case 6, LilycoveCity_Harbor_EventScript_21E4B6 - case 127, LilycoveCity_Harbor_EventScript_21E4B6 + case 2, LilycoveCity_Harbor_EventScript_GoToSouthernIslandFirstTime + case 3, LilycoveCity_Harbor_EventScript_GoToNavelRockFirstTime + case 4, LilycoveCity_Harbor_EventScript_GoToBirthIslandFirstTime + case 5, LilycoveCity_Harbor_EventScript_GoToFarawayIslandFirstTime + case 6, LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect + case MULTI_B_PRESSED, LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect release end -LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 - msgbox LilycoveCity_Harbor_Text_2A6A82, MSGBOX_DEFAULT +LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: @ 821E4B6 + msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT closemessage applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 @@ -337,11 +338,11 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 waitmovement 0 showobjectat 1, MAP_LILYCOVE_CITY_HARBOR delay 30 - msgbox LilycoveCity_Harbor_Text_21E842, MSGBOX_DEFAULT + msgbox LilycoveCity_Harbor_Text_SailAnotherTime, MSGBOX_DEFAULT release end -LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE +LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: @ 821E4EE applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 @@ -353,194 +354,198 @@ LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE waitmovement 0 return -LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 +LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: @ 821E514 applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 removeobject 4 - compare VAR_FACING, 2 - call_if_eq LilycoveCity_Harbor_EventScript_21E61B - compare VAR_FACING, 4 - call_if_eq LilycoveCity_Harbor_EventScript_21E610 + compare VAR_FACING, DIR_NORTH + call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth + compare VAR_FACING, DIR_EAST + call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast delay 30 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 - call LilycoveCity_Harbor_EventScript_2721E2 + call Common_EventScript_FerryDepart return -LilycoveCity_Harbor_EventScript_21E54D:: @ 821E54D - msgbox LilycoveCity_Harbor_Text_21E6F1, MSGBOX_DEFAULT +LilycoveCity_Harbor_EventScript_FerryUnavailable:: @ 821E54D + msgbox LilycoveCity_Harbor_Text_FerryUnavailable, MSGBOX_DEFAULT release end -LilycoveCity_Harbor_EventScript_21E557:: @ 821E557 - msgbox LilycoveCity_Harbor_Text_21E758, MSGBOX_DEFAULT - message LilycoveCity_Harbor_Text_21E7ED +LilycoveCity_Harbor_EventScript_NoEventTickets:: @ 821E557 + msgbox LilycoveCity_Harbor_Text_MayISeeYourTicket, MSGBOX_DEFAULT + message LilycoveCity_Harbor_Text_FlashTicketWhereTo waitmessage - goto LilycoveCity_Harbor_EventScript_21E09F + goto LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect end -LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B - msgbox LilycoveCity_Harbor_Text_21E792, MSGBOX_DEFAULT +@ Unused +LilycoveCity_Harbor_EventScript_NoTicket:: @ 821E56B + msgbox LilycoveCity_Harbor_Text_NoTicket, MSGBOX_DEFAULT release end -LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 - msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO +@ Unused +LilycoveCity_Harbor_EventScript_GoToSlateportUnused:: @ 821E575 + msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 + goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind setvar VAR_PORTHOLE_STATE, 5 - call LilycoveCity_Harbor_EventScript_21E5CC + call LilycoveCity_Harbor_EventScript_BoardFerry warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end -LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D - msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO +@ Unused +LilycoveCity_Harbor_EventScript_GoToBattleFrontierUnused:: @ 821E59D + msgbox LilycoveCity_Harbor_Text_BattleFrontierItIs, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 - call LilycoveCity_Harbor_EventScript_21E5CC + goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind + call LilycoveCity_Harbor_EventScript_BoardFerry warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate release end -LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0 - message LilycoveCity_Harbor_Text_21E8CC +LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind:: @ 821E5C0 + message LilycoveCity_Harbor_Text_WhereWouldYouLikeToGo waitmessage - goto LilycoveCity_Harbor_EventScript_21E09F + goto LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect end -LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC - msgbox LilycoveCity_Harbor_Text_21E89D, MSGBOX_DEFAULT +LilycoveCity_Harbor_EventScript_BoardFerry:: @ 821E5CC + msgbox LilycoveCity_Harbor_Text_PleaseBoard, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR - compare VAR_FACING, 2 - call_if_eq LilycoveCity_Harbor_EventScript_21E61B - compare VAR_FACING, 4 - call_if_eq LilycoveCity_Harbor_EventScript_21E610 + compare VAR_FACING, DIR_NORTH + call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth + compare VAR_FACING, DIR_EAST + call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast delay 30 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 - call LilycoveCity_Harbor_EventScript_2721E2 + call Common_EventScript_FerryDepart return -LilycoveCity_Harbor_EventScript_21E610:: @ 821E610 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E630 +LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast:: @ 821E610 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryEast waitmovement 0 return -LilycoveCity_Harbor_EventScript_21E61B:: @ 821E61B - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E633 +LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth:: @ 821E61B + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth waitmovement 0 return -LilycoveCity_Harbor_EventScript_21E626:: @ 821E626 - msgbox LilycoveCity_Harbor_Text_21E842, MSGBOX_DEFAULT +LilycoveCity_Harbor_EventScript_ExitSailSelect:: @ 821E626 + msgbox LilycoveCity_Harbor_Text_SailAnotherTime, MSGBOX_DEFAULT release end -LilycoveCity_Harbor_Movement_21E630: @ 821E630 +LilycoveCity_Harbor_Movement_PlayerBoardFerryEast: @ 821E630 walk_right walk_in_place_fastest_up step_end -LilycoveCity_Harbor_Movement_21E633: @ 821E633 +LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth: @ 821E633 walk_up step_end +@ Unused LilycoveCity_Harbor_Movement_21E635: @ 821E635 walk_up step_end -LilycoveCity_Harbor_EventScript_21E637:: @ 821E637 +LilycoveCity_Harbor_EventScript_Sailor:: @ 821E637 lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_21E64C - msgbox LilycoveCity_Harbor_Text_21E8EE, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_SailorFerryAvailable + msgbox LilycoveCity_Harbor_Text_SailorFerryUnavailable, MSGBOX_DEFAULT release end -LilycoveCity_Harbor_EventScript_21E64C:: @ 821E64C - msgbox LilycoveCity_Harbor_Text_21E976, MSGBOX_DEFAULT +LilycoveCity_Harbor_EventScript_SailorFerryAvailable:: @ 821E64C + msgbox LilycoveCity_Harbor_Text_SailorFerryAvailable, MSGBOX_DEFAULT release end -LilycoveCity_Harbor_EventScript_21E656:: @ 821E656 - applymovement 4, LilycoveCity_Harbor_Movement_21E66C +LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayNorth:: @ 821E656 + applymovement 4, LilycoveCity_Harbor_Movement_SailorOutOfWayNorth waitmovement 0 return -LilycoveCity_Harbor_EventScript_21E661:: @ 821E661 - applymovement 4, LilycoveCity_Harbor_Movement_21E671 +LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayEast:: @ 821E661 + applymovement 4, LilycoveCity_Harbor_Movement_SailorOutOfWayEast waitmovement 0 return -LilycoveCity_Harbor_Movement_21E66C: @ 821E66C +LilycoveCity_Harbor_Movement_SailorOutOfWayNorth: @ 821E66C walk_in_place_fastest_right lock_facing_direction walk_left unlock_facing_direction step_end -LilycoveCity_Harbor_Movement_21E671: @ 821E671 +LilycoveCity_Harbor_Movement_SailorOutOfWayEast: @ 821E671 lock_facing_direction walk_down unlock_facing_direction step_end -LilycoveCity_Harbor_EventScript_21E675:: @ 821E675 +LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth:: @ 821E675 applymovement 5, Common_Movement_WalkInPlaceLeft waitmovement 0 return -LilycoveCity_Harbor_EventScript_21E680:: @ 821E680 +LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast:: @ 821E680 applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 return -LilycoveCity_Harbor_EventScript_21E68B:: @ 821E68B +LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth:: @ 821E68B applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 return -LilycoveCity_Harbor_EventScript_21E696:: @ 821E696 +LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast:: @ 821E696 applymovement 5, Common_Movement_WalkInPlaceLeft waitmovement 0 return -LilycoveCity_Harbor_EventScript_21E6A1:: @ 821E6A1 - applymovement 5, LilycoveCity_Harbor_Movement_21E6D3 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E6D7 - applymovement 4, LilycoveCity_Harbor_Movement_21E6DC +LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorNorth:: @ 821E6A1 + applymovement 5, LilycoveCity_Harbor_Movement_BrineyBoardFerry + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyNorth + applymovement 4, LilycoveCity_Harbor_Movement_SailorBoardWithBrineyNorth waitmovement 0 return -LilycoveCity_Harbor_EventScript_21E6BA:: @ 821E6BA - applymovement 5, LilycoveCity_Harbor_Movement_21E6D3 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E6E4 - applymovement 4, LilycoveCity_Harbor_Movement_21E6EA +LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorEast:: @ 821E6BA + applymovement 5, LilycoveCity_Harbor_Movement_BrineyBoardFerry + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast + applymovement 4, LilycoveCity_Harbor_Movement_SailorBoardWithBrineyEast waitmovement 0 return -LilycoveCity_Harbor_Movement_21E6D3: @ 821E6D3 +LilycoveCity_Harbor_Movement_BrineyBoardFerry: @ 821E6D3 walk_in_place_fastest_up delay_8 set_invisible step_end -LilycoveCity_Harbor_Movement_21E6D7: @ 821E6D7 +LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyNorth: @ 821E6D7 delay_16 walk_up delay_16 set_invisible step_end -LilycoveCity_Harbor_Movement_21E6DC: @ 821E6DC +LilycoveCity_Harbor_Movement_SailorBoardWithBrineyNorth: @ 821E6DC delay_16 delay_16 delay_16 @@ -550,7 +555,7 @@ LilycoveCity_Harbor_Movement_21E6DC: @ 821E6DC set_invisible step_end -LilycoveCity_Harbor_Movement_21E6E4: @ 821E6E4 +LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast: @ 821E6E4 delay_16 walk_right walk_in_place_fastest_up @@ -558,7 +563,7 @@ LilycoveCity_Harbor_Movement_21E6E4: @ 821E6E4 set_invisible step_end -LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA +LilycoveCity_Harbor_Movement_SailorBoardWithBrineyEast: @ 821E6EA delay_16 delay_16 delay_16 @@ -567,51 +572,50 @@ LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA set_invisible step_end -LilycoveCity_Harbor_Text_21E6F1: @ 821E6F1 +LilycoveCity_Harbor_Text_FerryUnavailable: @ 821E6F1 .string "I beg your pardon?\n" .string "You're looking for a ship?\p" .string "I'm sorry, the ferry service isn't\n" .string "available at present…$" -LilycoveCity_Harbor_Text_21E758: @ 821E758 +LilycoveCity_Harbor_Text_MayISeeYourTicket: @ 821E758 .string "Hello, are you here for the ferry?\n" .string "May I see your TICKET?$" - -LilycoveCity_Harbor_Text_21E792: @ 821E792 +LilycoveCity_Harbor_Text_NoTicket: @ 821E792 .string "{PLAYER} doesn't have the TICKET…\p" .string "I'm terribly sorry.\p" .string "You must have a TICKET to board\n" .string "the ferry.$" -LilycoveCity_Harbor_Text_21E7ED: @ 821E7ED +LilycoveCity_Harbor_Text_FlashTicketWhereTo: @ 821E7ED .string "{PLAYER} flashed the TICKET.\p" .string "Perfect! That's all you need!\p" .string "And where would you like to go?$" -LilycoveCity_Harbor_Text_21E842: @ 821E842 +LilycoveCity_Harbor_Text_SailAnotherTime: @ 821E842 .string "Please sail with us another time!$" -LilycoveCity_Harbor_Text_21E864: @ 821E864 +LilycoveCity_Harbor_Text_SlateportItIs: @ 821E864 .string "SLATEPORT CITY it is, then!$" -LilycoveCity_Harbor_Text_21E880: @ 821E880 +LilycoveCity_Harbor_Text_BattleFrontierItIs: @ 821E880 .string "BATTLE FRONTIER it is, then!$" -LilycoveCity_Harbor_Text_21E89D: @ 821E89D +LilycoveCity_Harbor_Text_PleaseBoard: @ 821E89D .string "Please board the ferry and wait for\n" .string "departure.$" -LilycoveCity_Harbor_Text_21E8CC: @ 821E8CC +LilycoveCity_Harbor_Text_WhereWouldYouLikeToGo: @ 821E8CC .string "Then, where would you like to go?$" -LilycoveCity_Harbor_Text_21E8EE: @ 821E8EE +LilycoveCity_Harbor_Text_SailorFerryUnavailable: @ 821E8EE .string "Until they finish making the ferry,\n" .string "we sailors have nothing to do…\p" .string "I wish they'd get a move on, the folks\n" .string "at the SHIPYARD in SLATEPORT.$" -LilycoveCity_Harbor_Text_21E976: @ 821E976 +LilycoveCity_Harbor_Text_SailorFerryAvailable: @ 821E976 .string "The ferry S.S. TIDAL is finally in\n" .string "operation.\p" .string "The folks at the SHIPYARD in SLATEPORT\n" diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index 8f2cdde28..8ac18ba85 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -10,7 +10,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 applymovement 2, Common_Movement_FacePlayer message LilycoveCity_LilycoveMuseum_1F_Text_218EBC waitmessage - multichoice 20, 8, 16, 1 + multichoice 20, 8, MULTI_VIEWED_PAINTINGS, 1 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5 compare VAR_RESULT, 1 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 948c447bf..d9ba545fb 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -564,7 +564,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D setvar VAR_0x8004, 8 switch VAR_RESULT case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F - case 127, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F + case MULTI_B_PRESSED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F setvar VAR_0x8004, 8 special BufferStreakTrainerText copyvar VAR_0x8006, VAR_0x800A diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index 3913a9801..4c4afd8e2 100644 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -25,7 +25,7 @@ MauvilleCity_BikeShop_EventScript_20EBF7:: @ 820EBF7 MauvilleCity_BikeShop_EventScript_20EC16:: @ 820EC16 message MauvilleCity_BikeShop_Text_20EF32 waitmessage - multichoice 21, 8, 12, 1 + multichoice 21, 8, MULTI_BIKE, 1 switch VAR_RESULT case 0, MauvilleCity_BikeShop_EventScript_20EC53 case 1, MauvilleCity_BikeShop_EventScript_20EC6D @@ -112,13 +112,13 @@ MauvilleCity_BikeShop_EventScript_20ED3A:: @ 820ED3A end MauvilleCity_BikeShop_EventScript_20ED46:: @ 820ED46 - multichoice 0, 0, 43, 0 + multichoice 0, 0, MULTI_MACH_BIKE_INFO, 0 switch VAR_RESULT case 0, MauvilleCity_BikeShop_EventScript_20ED88 case 1, MauvilleCity_BikeShop_EventScript_20ED94 case 2, MauvilleCity_BikeShop_EventScript_20EDA0 case 3, MauvilleCity_BikeShop_EventScript_20EDAC - case 127, MauvilleCity_BikeShop_EventScript_20EDAC + case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_20EDAC end MauvilleCity_BikeShop_EventScript_20ED88:: @ 820ED88 @@ -150,13 +150,13 @@ MauvilleCity_BikeShop_EventScript_20EDAE:: @ 820EDAE end MauvilleCity_BikeShop_EventScript_20EDBA:: @ 820EDBA - multichoice 0, 0, 44, 0 + multichoice 0, 0, MULTI_ACRO_BIKE_INFO, 0 switch VAR_RESULT case 0, MauvilleCity_BikeShop_EventScript_20EDFC case 1, MauvilleCity_BikeShop_EventScript_20EE08 case 2, MauvilleCity_BikeShop_EventScript_20EE14 case 3, MauvilleCity_BikeShop_EventScript_20EE20 - case 127, MauvilleCity_BikeShop_EventScript_20EE20 + case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_20EE20 end MauvilleCity_BikeShop_EventScript_20EDFC:: @ 820EDFC diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 03e3f6c70..a6ee8ec85 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -15,7 +15,7 @@ MauvilleCity_GameCorner_EventScript_20FBB9:: @ 820FBB9 goto MauvilleCity_GameCorner_EventScript_20FBE5 MauvilleCity_GameCorner_EventScript_20FBE5:: @ 820FBE5 - multichoicedefault 15, 0, 49, 0, 0 + multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 0, 0 switch VAR_RESULT case 0, MauvilleCity_GameCorner_EventScript_20FC33 case 1, MauvilleCity_GameCorner_EventScript_20FC75 @@ -23,7 +23,7 @@ MauvilleCity_GameCorner_EventScript_20FBE5:: @ 820FBE5 end MauvilleCity_GameCorner_EventScript_20FC0C:: @ 820FC0C - multichoicedefault 15, 0, 49, 1, 0 + multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 1, 0 switch VAR_RESULT case 0, MauvilleCity_GameCorner_EventScript_20FC33 case 1, MauvilleCity_GameCorner_EventScript_20FC75 @@ -125,7 +125,7 @@ MauvilleCity_GameCorner_EventScript_20FD20:: @ 820FD20 goto MauvilleCity_GameCorner_EventScript_20FD2B MauvilleCity_GameCorner_EventScript_20FD2B:: @ 820FD2B - multichoice 12, 0, 48, 0 + multichoice 12, 0, MULTI_GAME_CORNER_DOLLS, 0 switch VAR_RESULT case 0, MauvilleCity_GameCorner_EventScript_20FD67 case 1, MauvilleCity_GameCorner_EventScript_20FD75 @@ -246,7 +246,7 @@ MauvilleCity_GameCorner_EventScript_20FECE:: @ 820FECE goto MauvilleCity_GameCorner_EventScript_20FED9 MauvilleCity_GameCorner_EventScript_20FED9:: @ 820FED9 - multichoice 12, 0, 55, 0 + multichoice 12, 0, MULTI_GAME_CORNER_TMS, 0 switch VAR_RESULT case 0, MauvilleCity_GameCorner_EventScript_20FF2B case 1, MauvilleCity_GameCorner_EventScript_20FF3E diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 332e6dbea..873b4fd3b 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -4,10 +4,10 @@ NavelRock_Harbor_MapScripts:: @ 82690BC NavelRock_Harbor_EventScript_2690BD:: @ 82690BD lock faceplayer - msgbox NavelRock_Harbor_Text_2C6CE6, MSGBOX_YESNO + msgbox NavelRock_Harbor_Text_SailorReturn, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq NavelRock_Harbor_EventScript_269102 - msgbox NavelRock_Harbor_Text_2A6A5D, MSGBOX_DEFAULT + msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 @@ -21,7 +21,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD end NavelRock_Harbor_EventScript_269102:: @ 8269102 - msgbox NavelRock_Harbor_Text_2A6A82, MSGBOX_DEFAULT + msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT release end diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index c2877f0d9..b2baff82b 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -41,11 +41,11 @@ Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE message Route104_MrBrineysHouse_Text_22A268 waitmessage - multichoicedefault 20, 8, 14, 1, 0 + multichoicedefault 20, 8, MULTI_BRINEY_OFF_DEWFORD, 1, 0 switch VAR_RESULT case 0, Route104_MrBrineysHouse_EventScript_229E27 case 1, Route104_MrBrineysHouse_EventScript_229E1D - case 127, Route104_MrBrineysHouse_EventScript_229E1D + case MULTI_B_PRESSED, Route104_MrBrineysHouse_EventScript_229E1D end Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1 diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index c91d0f0ab..a74c3223d 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -287,11 +287,11 @@ Route109_EventScript_1EE921:: @ 81EE921 Route109_EventScript_1EE93F:: @ 81EE93F message Route109_Text_1EEE17 waitmessage - multichoicedefault 21, 8, 14, 1, 0 + multichoicedefault 21, 8, MULTI_BRINEY_OFF_DEWFORD, 1, 0 switch VAR_RESULT case 0, Route109_EventScript_1EE972 case 1, Route109_EventScript_1EE98B - case 127, Route109_EventScript_1EE98B + case MULTI_B_PRESSED, Route109_EventScript_1EE98B end Route109_EventScript_1EE972:: @ 81EE972 diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index da13f82dc..048e64174 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -176,7 +176,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 end Route110_TrickHouseEnd_EventScript_26AFA5:: @ 826AFA5 - multichoice 0, 0, 88, 1 + multichoice 0, 0, MULTI_TENT, 1 switch VAR_RESULT case 0, Route110_TrickHouseEnd_EventScript_26AFBF goto Route110_TrickHouseEnd_EventScript_26AFC7 diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index e8260b941..0e729d333 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -451,7 +451,7 @@ Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 end Route110_TrickHouseEntrance_EventScript_26A070:: @ 826A070 - multichoice 0, 0, 88, 1 + multichoice 0, 0, MULTI_TENT, 1 switch VAR_RESULT case 0, Route110_TrickHouseEntrance_EventScript_26A08A goto Route110_TrickHouseEntrance_EventScript_26A092 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 9ae8dc759..b678840b6 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -327,7 +327,7 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45 msgbox Route110_TrickHousePuzzle5_Text_26D757, MSGBOX_DEFAULT - multichoice 0, 0, 25, 1 + multichoice 0, 0, MULTI_MECHADOLL1_Q1, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 @@ -335,7 +335,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45 Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68 msgbox Route110_TrickHousePuzzle5_Text_26D7AA, MSGBOX_DEFAULT - multichoice 0, 0, 26, 1 + multichoice 0, 0, MULTI_MECHADOLL1_Q2, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 @@ -343,7 +343,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68 Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B msgbox Route110_TrickHousePuzzle5_Text_26D7FC, MSGBOX_DEFAULT - multichoice 0, 0, 27, 1 + multichoice 0, 0, MULTI_MECHADOLL1_Q3, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 @@ -351,7 +351,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE msgbox Route110_TrickHousePuzzle5_Text_26D940, MSGBOX_DEFAULT - multichoice 0, 0, 28, 1 + multichoice 0, 0, MULTI_MECHADOLL2_Q1, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 @@ -359,7 +359,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1 msgbox Route110_TrickHousePuzzle5_Text_26D98C, MSGBOX_DEFAULT - multichoice 0, 0, 29, 1 + multichoice 0, 0, MULTI_MECHADOLL2_Q2, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 @@ -367,7 +367,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1 Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4 msgbox Route110_TrickHousePuzzle5_Text_26D9CE, MSGBOX_DEFAULT - multichoice 0, 0, 30, 1 + multichoice 0, 0, MULTI_MECHADOLL2_Q3, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 @@ -375,7 +375,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4 Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017 msgbox Route110_TrickHousePuzzle5_Text_26DA64, MSGBOX_DEFAULT - multichoice 0, 0, 31, 1 + multichoice 0, 0, MULTI_MECHADOLL3_Q1, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 @@ -383,7 +383,7 @@ Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017 Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A msgbox Route110_TrickHousePuzzle5_Text_26DAAD, MSGBOX_DEFAULT - multichoice 0, 0, 32, 1 + multichoice 0, 0, MULTI_MECHADOLL3_Q2, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 @@ -391,7 +391,7 @@ Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D msgbox Route110_TrickHousePuzzle5_Text_26DAFF, MSGBOX_DEFAULT - multichoice 0, 0, 33, 1 + multichoice 0, 0, MULTI_MECHADOLL3_Q3, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 @@ -399,7 +399,7 @@ Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080 msgbox Route110_TrickHousePuzzle5_Text_26DB94, MSGBOX_DEFAULT - multichoice 0, 0, 34, 1 + multichoice 0, 0, MULTI_MECHADOLL4_Q1, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 @@ -407,7 +407,7 @@ Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080 Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3 msgbox Route110_TrickHousePuzzle5_Text_26DBD7, MSGBOX_DEFAULT - multichoice 0, 0, 35, 1 + multichoice 0, 0, MULTI_MECHADOLL4_Q2, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 @@ -415,7 +415,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3 Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6 msgbox Route110_TrickHousePuzzle5_Text_26DC2A, MSGBOX_DEFAULT - multichoice 0, 0, 36, 1 + multichoice 0, 0, MULTI_MECHADOLL4_Q3, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 @@ -423,7 +423,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6 Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9 msgbox Route110_TrickHousePuzzle5_Text_26DCCB, MSGBOX_DEFAULT - multichoice 0, 0, 37, 1 + multichoice 0, 0, MULTI_MECHADOLL5_Q1, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 @@ -431,7 +431,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9 Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C msgbox Route110_TrickHousePuzzle5_Text_26DD1B, MSGBOX_DEFAULT - multichoice 0, 0, 38, 1 + multichoice 0, 0, MULTI_MECHADOLL5_Q2, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 @@ -439,7 +439,7 @@ Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F msgbox Route110_TrickHousePuzzle5_Text_26DD5F, MSGBOX_DEFAULT - multichoice 0, 0, 39, 1 + multichoice 0, 0, MULTI_MECHADOLL5_Q3, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 goto Route110_TrickHousePuzzle5_EventScript_26D152 diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 401a952ed..22acd676d 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -64,7 +64,7 @@ Route113_GlassWorkshop_EventScript_26EDA7:: @ 826EDA7 case 5, Route113_GlassWorkshop_EventScript_26EF4A case 6, Route113_GlassWorkshop_EventScript_26EF8B case 7, Route113_GlassWorkshop_EventScript_26EFCC - case 127, Route113_GlassWorkshop_EventScript_26EFCC + case MULTI_B_PRESSED, Route113_GlassWorkshop_EventScript_26EFCC end Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 2b340f584..0fa59783d 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -86,7 +86,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270ADE:: @ 8270ADE end Route124_DivingTreasureHuntersHouse_EventScript_270B8F:: @ 8270B8F - multichoice 0, 0, 58, 0 + multichoice 0, 0, MULTI_SHARDS_R, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D @@ -94,7 +94,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270B8F:: @ 8270B8F end Route124_DivingTreasureHuntersHouse_EventScript_270BB5:: @ 8270BB5 - multichoice 0, 0, 59, 0 + multichoice 0, 0, MULTI_SHARDS_Y, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D @@ -102,7 +102,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270BB5:: @ 8270BB5 end Route124_DivingTreasureHuntersHouse_EventScript_270BDB:: @ 8270BDB - multichoice 0, 0, 60, 0 + multichoice 0, 0, MULTI_SHARDS_RY, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 @@ -111,7 +111,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270BDB:: @ 8270BDB end Route124_DivingTreasureHuntersHouse_EventScript_270C0C:: @ 8270C0C - multichoice 0, 0, 61, 0 + multichoice 0, 0, MULTI_SHARDS_B, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D @@ -119,7 +119,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270C0C:: @ 8270C0C end Route124_DivingTreasureHuntersHouse_EventScript_270C32:: @ 8270C32 - multichoice 0, 0, 62, 0 + multichoice 0, 0, MULTI_SHARDS_RB, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 @@ -128,7 +128,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270C32:: @ 8270C32 end Route124_DivingTreasureHuntersHouse_EventScript_270C63:: @ 8270C63 - multichoice 0, 0, 63, 0 + multichoice 0, 0, MULTI_SHARDS_YB, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 @@ -137,7 +137,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270C63:: @ 8270C63 end Route124_DivingTreasureHuntersHouse_EventScript_270C94:: @ 8270C94 - multichoice 0, 0, 64, 0 + multichoice 0, 0, MULTI_SHARDS_RYB, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 @@ -147,7 +147,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270C94:: @ 8270C94 end Route124_DivingTreasureHuntersHouse_EventScript_270CD0:: @ 8270CD0 - multichoice 0, 0, 65, 0 + multichoice 0, 0, MULTI_SHARDS_G, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D @@ -155,7 +155,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270CD0:: @ 8270CD0 end Route124_DivingTreasureHuntersHouse_EventScript_270CF6:: @ 8270CF6 - multichoice 0, 0, 66, 0 + multichoice 0, 0, MULTI_SHARDS_RG, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 @@ -164,7 +164,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270CF6:: @ 8270CF6 end Route124_DivingTreasureHuntersHouse_EventScript_270D27:: @ 8270D27 - multichoice 0, 0, 67, 0 + multichoice 0, 0, MULTI_SHARDS_YG, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 @@ -173,7 +173,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270D27:: @ 8270D27 end Route124_DivingTreasureHuntersHouse_EventScript_270D58:: @ 8270D58 - multichoice 0, 0, 68, 0 + multichoice 0, 0, MULTI_SHARDS_RYG, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 @@ -183,7 +183,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270D58:: @ 8270D58 end Route124_DivingTreasureHuntersHouse_EventScript_270D94:: @ 8270D94 - multichoice 0, 0, 69, 0 + multichoice 0, 0, MULTI_SHARDS_BG, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 @@ -192,7 +192,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270D94:: @ 8270D94 end Route124_DivingTreasureHuntersHouse_EventScript_270DC5:: @ 8270DC5 - multichoice 0, 0, 70, 0 + multichoice 0, 0, MULTI_SHARDS_RBG, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 @@ -202,7 +202,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270DC5:: @ 8270DC5 end Route124_DivingTreasureHuntersHouse_EventScript_270E01:: @ 8270E01 - multichoice 0, 0, 71, 0 + multichoice 0, 0, MULTI_SHARDS_YBG, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 @@ -212,7 +212,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270E01:: @ 8270E01 end Route124_DivingTreasureHuntersHouse_EventScript_270E3D:: @ 8270E3D - multichoice 0, 0, 72, 0 + multichoice 0, 0, MULTI_SHARDS_RYBG, 0 switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index a81548d5d..666691135 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -78,7 +78,7 @@ RustboroCity_EventScript_1E07AC:: @ 81E07AC RustboroCity_EventScript_1E07BD:: @ 81E07BD setflag FLAG_ADDED_MATCH_CALL_TO_POKENAV - special sp106_CreateStartMenu + special ScriptMenu_CreateStartMenuForPokenavTutorial waitstate switch VAR_RESULT case 0, RustboroCity_EventScript_1E07AC @@ -88,7 +88,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD case 5, RustboroCity_EventScript_1E07AC case 6, RustboroCity_EventScript_1E07AC case 7, RustboroCity_EventScript_1E07AC - case 127, RustboroCity_EventScript_1E07AC + case MULTI_B_PRESSED, RustboroCity_EventScript_1E07AC special sub_81C72A4 waitstate delay 20 diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 51aacd37b..0784f523c 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -256,12 +256,12 @@ RustboroCity_DevonCorp_2F_EventScript_211B7A:: @ 8211B7A RustboroCity_DevonCorp_2F_EventScript_211B84:: @ 8211B84 message RustboroCity_DevonCorp_2F_Text_212092 waitmessage - multichoice 17, 6, 93, 0 + multichoice 17, 6, MULTI_FOSSIL, 0 switch VAR_RESULT case 0, RustboroCity_DevonCorp_2F_EventScript_211BC1 case 1, RustboroCity_DevonCorp_2F_EventScript_211BC7 case 2, RustboroCity_DevonCorp_2F_EventScript_211BCD - case 127, RustboroCity_DevonCorp_2F_EventScript_211BCD + case MULTI_B_PRESSED, RustboroCity_DevonCorp_2F_EventScript_211BCD end RustboroCity_DevonCorp_2F_EventScript_211BC1:: @ 8211BC1 diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index ff52ee5ac..4d0abc9c3 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -10,7 +10,7 @@ RustboroCity_PokemonSchool_EventScript_213EA9:: @ 8213EA9 RustboroCity_PokemonSchool_EventScript_213EB8:: @ 8213EB8 message RustboroCity_PokemonSchool_Text_2140F9 waitmessage - multichoicegrid 8, 1, 13, 3, 0 + multichoicegrid 8, 1, MULTI_STATUS_INFO, 3, 0 switch VAR_RESULT case 0, RustboroCity_PokemonSchool_EventScript_213F17 case 1, RustboroCity_PokemonSchool_EventScript_213F25 @@ -18,7 +18,7 @@ RustboroCity_PokemonSchool_EventScript_213EB8:: @ 8213EB8 case 3, RustboroCity_PokemonSchool_EventScript_213F41 case 4, RustboroCity_PokemonSchool_EventScript_213F4F case 5, RustboroCity_PokemonSchool_EventScript_213F5D - case 127, RustboroCity_PokemonSchool_EventScript_213F5D + case MULTI_B_PRESSED, RustboroCity_PokemonSchool_EventScript_213F5D end RustboroCity_PokemonSchool_EventScript_213F17:: @ 8213F17 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 1dab43fdf..e4753b501 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -764,7 +764,7 @@ SlateportCity_EventScript_1DD3CA:: @ 81DD3CA case 9, SlateportCity_EventScript_1DD522 case 10, SlateportCity_EventScript_1DD536 case 11, SlateportCity_EventScript_1DD54A - case 127, SlateportCity_EventScript_1DD54A + case MULTI_B_PRESSED, SlateportCity_EventScript_1DD54A end SlateportCity_EventScript_1DD46E:: @ 81DD46E diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index e0d4c1706..5ab5b78e9 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -75,7 +75,7 @@ SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D call_if_eq SlateportCity_BattleTentCorridor_EventScript_209014 compare VAR_RESULT, 2 call_if_eq SlateportCity_BattleTentCorridor_EventScript_20901B - multichoice 20, 6, 104, 1 + multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT case 0, SlateportCity_BattleTentCorridor_EventScript_208FBB case 1, SlateportCity_BattleTentCorridor_EventScript_208F5B @@ -91,11 +91,11 @@ SlateportCity_BattleTentCorridor_EventScript_208F5B:: @ 8208F5B SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89 message SlateportCity_BattleTentCorridor_Text_25A37A waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, SlateportCity_BattleTentCorridor_EventScript_208F0D case 0, SlateportCity_BattleTentCorridor_EventScript_209A1B - case 127, SlateportCity_BattleTentCorridor_EventScript_208F0D + case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208F0D SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB setvar VAR_0x8004, 8 @@ -104,7 +104,7 @@ SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB switch VAR_RESULT case 0, SlateportCity_BattleTentCorridor_EventScript_208EB4 case 1, SlateportCity_BattleTentCorridor_EventScript_208FF1 - case 127, SlateportCity_BattleTentCorridor_EventScript_208EB4 + case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208EB4 SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1 fadescreen 1 diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index e7ce11a39..80545a7f2 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -128,12 +128,12 @@ SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA message SlateportCity_BattleTentLobby_Text_2C586A waitmessage - multichoice 17, 6, 23, 0 + multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT case 0, SlateportCity_BattleTentLobby_EventScript_208906 case 1, SlateportCity_BattleTentLobby_EventScript_208A07 case 2, SlateportCity_BattleTentLobby_EventScript_208A2E - case 127, SlateportCity_BattleTentLobby_EventScript_208A2E + case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_208A2E SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 setvar VAR_FRONTIER_FACILITY, 4 @@ -281,7 +281,7 @@ SlateportCity_BattleTentLobby_EventScript_208A99:: @ 8208A99 SlateportCity_BattleTentLobby_EventScript_208AA8:: @ 8208AA8 message SlateportCity_BattleTentLobby_Text_259743 waitmessage - multichoice 17, 0, 111, 0 + multichoice 17, 0, MULTI_SLATEPORT_TENT_RULES, 0 switch VAR_RESULT case 0, SlateportCity_BattleTentLobby_EventScript_208B06 case 1, SlateportCity_BattleTentLobby_EventScript_208B14 @@ -289,7 +289,7 @@ SlateportCity_BattleTentLobby_EventScript_208AA8:: @ 8208AA8 case 3, SlateportCity_BattleTentLobby_EventScript_208B30 case 4, SlateportCity_BattleTentLobby_EventScript_208B3E case 5, SlateportCity_BattleTentLobby_EventScript_208B4C - case 127, SlateportCity_BattleTentLobby_EventScript_208B4C + case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_208B4C end SlateportCity_BattleTentLobby_EventScript_208B06:: @ 8208B06 diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index c46923bb0..b6888ddd5 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -175,20 +175,20 @@ SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06 SlateportCity_Harbor_EventScript_20CB1A:: @ 820CB1A goto_if_set FLAG_MET_SCOTT_ON_SS_TIDAL, SlateportCity_Harbor_EventScript_20CB50 - multichoicedefault 18, 8, 56, 2, 0 + multichoicedefault 18, 8, MULTI_SSTIDAL_SLATEPORT_NO_BF, 2, 0 switch VAR_RESULT case 0, SlateportCity_Harbor_EventScript_20CB92 case 1, SlateportCity_Harbor_EventScript_20CC2D - case 127, SlateportCity_Harbor_EventScript_20CC2D + case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_20CC2D end SlateportCity_Harbor_EventScript_20CB50:: @ 820CB50 - multichoicedefault 17, 6, 52, 2, 0 + multichoicedefault 17, 6, MULTI_SSTIDAL_SLATEPORT_WITH_BF, 2, 0 switch VAR_RESULT case 0, SlateportCity_Harbor_EventScript_20CB92 case 1, SlateportCity_Harbor_EventScript_20CBBA case 2, SlateportCity_Harbor_EventScript_20CC2D - case 127, SlateportCity_Harbor_EventScript_20CC2D + case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_20CC2D end SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88 @@ -237,7 +237,7 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 delay 30 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 5 - call SlateportCity_Harbor_EventScript_2721E2 + call Common_EventScript_FerryDepart return SlateportCity_Harbor_EventScript_20CC2D:: @ 820CC2D @@ -344,12 +344,12 @@ SlateportCity_Harbor_EventScript_20CD38:: @ 820CD38 end SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44 - multichoice 0, 0, 46, 0 + multichoice 0, 0, MULTI_STERN_DEEPSEA, 0 switch VAR_RESULT case 0, SlateportCity_Harbor_EventScript_20CD7B case 1, SlateportCity_Harbor_EventScript_20CDBB case 2, SlateportCity_Harbor_EventScript_20CDFB - case 127, SlateportCity_Harbor_EventScript_20CDFB + case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_20CDFB end SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index e3ecfa3db..2ee0ae602 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -9,10 +9,10 @@ SouthernIsland_Exterior_OnTransition: @ 82429CE SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 lock faceplayer - msgbox SouthernIsland_Exterior_Text_2A69F1, MSGBOX_YESNO + msgbox EventTicket_Text_SouthernIslandSailBack, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq SouthernIsland_Exterior_EventScript_242A17 - msgbox SouthernIsland_Exterior_Text_2A6A5D, MSGBOX_DEFAULT + msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 @@ -26,7 +26,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 end SouthernIsland_Exterior_EventScript_242A17:: @ 8242A17 - msgbox SouthernIsland_Exterior_Text_2A6A82, MSGBOX_DEFAULT + msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT release end @@ -50,6 +50,6 @@ BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39 step_end SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C - msgbox SouthernIsland_Exterior_Text_2A6AD5, MSGBOX_SIGN + msgbox SouthernIsland_Exterior_Text_Sign, MSGBOX_SIGN end diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index c7bd4d9a0..6283516b0 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -108,7 +108,7 @@ SouthernIsland_Interior_EventScript_242B8F:: @ 8242B8F end SouthernIsland_Interior_EventScript_242B9A:: @ 8242B9A - msgbox SouthernIsland_Interior_Text_2A6AA1, MSGBOX_DEFAULT + msgbox SouthernIsland_Interior_Text_Sign, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 03ddc47c2..840822780 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -150,12 +150,12 @@ TrainerHill_Entrance_EventScript_268275:: @ 8268275 TrainerHill_Entrance_EventScript_26827D:: @ 826827D message TrainerHill_Entrance_Text_2685F8 waitmessage - multichoice 15, 6, 17, 0 + multichoice 15, 6, MULTI_YESNOINFO, 0 switch VAR_RESULT case 0, TrainerHill_Entrance_EventScript_2682C8 case 1, TrainerHill_Entrance_EventScript_268314 case 2, TrainerHill_Entrance_EventScript_2682BA - case 127, TrainerHill_Entrance_EventScript_268314 + case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_268314 end TrainerHill_Entrance_EventScript_2682BA:: @ 82682BA @@ -164,10 +164,10 @@ TrainerHill_Entrance_EventScript_2682BA:: @ 82682BA end TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 - multichoice 13, 2, 113, 0 + multichoice 13, 2, MULTI_TAG_MATCH_TYPE, 0 switch VAR_RESULT case 4, TrainerHill_Entrance_EventScript_268314 - case 127, TrainerHill_Entrance_EventScript_268314 + case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_268314 setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_TAG copyvar VAR_0x8005, VAR_RESULT special CallTrainerHillFunction diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index b43bc6077..fd8c05546 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -98,7 +98,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202565 compare VAR_RESULT, 2 call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_20256C - multichoice 20, 6, 104, 1 + multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 switch VAR_RESULT case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20248A @@ -114,11 +114,11 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20248A:: @ 820248A VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8 message VerdanturfTown_BattleTentBattleRoom_Text_25005A waitmessage - multichoicedefault 20, 8, 94, 1, 0 + multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA - case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C + case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA applymovement 3, Common_Movement_WalkInPlaceRight diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 783d9ec85..5bc309663 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -141,12 +141,12 @@ VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873 VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893 message VerdanturfTown_BattleTentLobby_Text_2C5129 waitmessage - multichoice 17, 6, 23, 0 + multichoice 17, 6, MULTI_CHALLENGEINFO, 0 switch VAR_RESULT case 0, VerdanturfTown_BattleTentLobby_EventScript_2018CF case 1, VerdanturfTown_BattleTentLobby_EventScript_2019DB case 2, VerdanturfTown_BattleTentLobby_EventScript_201A37 - case 127, VerdanturfTown_BattleTentLobby_EventScript_201A37 + case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_201A37 VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF setvar VAR_FRONTIER_FACILITY, 2 @@ -343,7 +343,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201B11:: @ 8201B11 case 4, VerdanturfTown_BattleTentLobby_EventScript_201BB6 case 5, VerdanturfTown_BattleTentLobby_EventScript_201BC4 case 6, VerdanturfTown_BattleTentLobby_EventScript_201BD2 - case 127, VerdanturfTown_BattleTentLobby_EventScript_201BD2 + case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_201BD2 end VerdanturfTown_BattleTentLobby_EventScript_201B7E:: @ 8201B7E diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index e8d42f184..3fcb25807 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -344,22 +344,22 @@ OldaleTown_PokemonCenter_2F_EventScript_276E22:: @ 8276E22 OldaleTown_PokemonCenter_2F_EventScript_276E30:: @ 8276E30 setvar VAR_0x8004, 0 goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_276E75 - multichoice 0, 0, 74, 0 + multichoice 0, 0, MULTI_CABLE_CLUB_NO_RECORD_MIX, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2 case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7 case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_276E75:: @ 8276E75 - multichoice 0, 0, 76, 0 + multichoice 0, 0, MULTI_CABLE_CLUB_WITH_RECORD_MIX, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2 case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7 case 2, OldaleTown_PokemonCenter_2F_EventScript_2771DB case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_276EB7:: @ 8276EB7 @@ -370,14 +370,14 @@ OldaleTown_PokemonCenter_2F_EventScript_276EB7:: @ 8276EB7 OldaleTown_PokemonCenter_2F_EventScript_276EC2:: @ 8276EC2 message OldaleTown_PokemonCenter_2F_Text_2790BE waitmessage - multichoice 0, 0, 18, 0 + multichoice 0, 0, MULTI_BATTLE_MODE, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_276F23 case 1, OldaleTown_PokemonCenter_2F_EventScript_276F2E case 2, OldaleTown_PokemonCenter_2F_EventScript_276F55 case 3, OldaleTown_PokemonCenter_2F_EventScript_276F15 case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_276F15:: @ 8276F15 @@ -392,7 +392,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23 OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_276F47 setvar VAR_0x8004, 2 goto OldaleTown_PokemonCenter_2F_EventScript_276F60 @@ -991,12 +991,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B end OldaleTown_PokemonCenter_2F_EventScript_27755C:: @ 827755C - multichoice 17, 6, 17, 0 + multichoice 17, 6, MULTI_YESNOINFO, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27759F case 1, OldaleTown_PokemonCenter_2F_EventScript_2772EC case 2, OldaleTown_PokemonCenter_2F_EventScript_277593 - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_277593:: @ 8277593 @@ -1103,44 +1103,44 @@ OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3 compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27778B goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_27773E - multichoice 0, 0, 78, 0 + multichoice 0, 0, MULTI_WIRELESS_NO_RECORD, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B case 2, OldaleTown_PokemonCenter_2F_EventScript_2778F7 case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_27773E:: @ 827773E - multichoice 0, 0, 79, 0 + multichoice 0, 0, MULTI_WIRELESS_ALL_SERVICES, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B case 2, OldaleTown_PokemonCenter_2F_EventScript_2778D9 case 3, OldaleTown_PokemonCenter_2F_EventScript_2778F7 case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_27778B:: @ 827778B goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_2777CB - multichoice 0, 0, 75, 0 + multichoice 0, 0, MULTI_WIRELESS_NO_RECORD_BERRY, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB - multichoice 0, 0, 77, 0 + multichoice 0, 0, MULTI_WIRELESS_NO_BERRY, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B case 2, OldaleTown_PokemonCenter_2F_EventScript_2778D9 case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D @@ -1157,14 +1157,14 @@ OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D OldaleTown_PokemonCenter_2F_EventScript_27783B:: @ 827783B message OldaleTown_PokemonCenter_2F_Text_2790BE waitmessage - multichoice 0, 0, 18, 0 + multichoice 0, 0, MULTI_BATTLE_MODE, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27788E case 1, OldaleTown_PokemonCenter_2F_EventScript_277899 case 2, OldaleTown_PokemonCenter_2F_EventScript_2778C0 case 3, OldaleTown_PokemonCenter_2F_EventScript_2778CB case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E @@ -1174,7 +1174,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899 special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_2778B2 setvar VAR_0x8004, 1 goto OldaleTown_PokemonCenter_2F_EventScript_277931 @@ -1235,12 +1235,12 @@ OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931 OldaleTown_PokemonCenter_2F_EventScript_277989:: @ 8277989 message OldaleTown_PokemonCenter_2F_Text_2792CD waitmessage - multichoice 16, 6, 81, 0 + multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_2779EE case 1, OldaleTown_PokemonCenter_2F_EventScript_2779C6 case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_2779C6:: @ 82779C6 @@ -1268,12 +1268,12 @@ OldaleTown_PokemonCenter_2F_EventScript_2779EE:: @ 82779EE OldaleTown_PokemonCenter_2F_EventScript_277A16:: @ 8277A16 message OldaleTown_PokemonCenter_2F_Text_279334 waitmessage - multichoice 16, 6, 81, 0 + multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_277A7B case 1, OldaleTown_PokemonCenter_2F_EventScript_277A53 case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_277A53:: @ 8277A53 @@ -1301,12 +1301,12 @@ OldaleTown_PokemonCenter_2F_EventScript_277A7B:: @ 8277A7B OldaleTown_PokemonCenter_2F_EventScript_277AA3:: @ 8277AA3 message OldaleTown_PokemonCenter_2F_Text_2793A3 waitmessage - multichoice 16, 6, 81, 0 + multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_277B08 case 1, OldaleTown_PokemonCenter_2F_EventScript_277AE0 case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC end OldaleTown_PokemonCenter_2F_EventScript_277AE0:: @ 8277AE0 @@ -1445,12 +1445,12 @@ MossdeepCity_GameCorner_1F_EventScript_277C34:: @ 8277C34 faceplayer message MossdeepCity_GameCorner_1F_Text_278A7D waitmessage - multichoice 0, 0, 80, 0 + multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0 switch VAR_RESULT case 0, MossdeepCity_GameCorner_1F_EventScript_277C73 case 1, MossdeepCity_GameCorner_1F_EventScript_277C7D case 2, MossdeepCity_GameCorner_1F_EventScript_277C87 - case 127, MossdeepCity_GameCorner_1F_EventScript_277C87 + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_277C87 end MossdeepCity_GameCorner_1F_EventScript_277C73:: @ 8277C73 @@ -1479,12 +1479,12 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91 delay 60 message MossdeepCity_GameCorner_1F_Text_278DAD waitmessage - multichoice 0, 0, 80, 0 + multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0 switch VAR_RESULT case 0, MossdeepCity_GameCorner_1F_EventScript_277CE9 case 1, MossdeepCity_GameCorner_1F_EventScript_277D35 case 2, MossdeepCity_GameCorner_1F_EventScript_2772F9 - case 127, MossdeepCity_GameCorner_1F_EventScript_2772F9 + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_2772F9 end MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 @@ -1528,12 +1528,12 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35 MossdeepCity_GameCorner_1F_EventScript_277D81:: @ 8277D81 message MossdeepCity_GameCorner_1F_Text_2793A3 waitmessage - multichoice 16, 6, 81, 0 + multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT case 0, MossdeepCity_GameCorner_1F_EventScript_277DE6 case 1, MossdeepCity_GameCorner_1F_EventScript_277DBE case 2, MossdeepCity_GameCorner_1F_EventScript_2772F9 - case 127, MossdeepCity_GameCorner_1F_EventScript_2772F9 + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_2772F9 end MossdeepCity_GameCorner_1F_EventScript_277DBE:: @ 8277DBE @@ -1626,15 +1626,15 @@ OldaleTown_PokemonCenter_2F_Text_277EF1: @ 8277EF1 .string "Which of our services do you wish\n" .string "to use?$" -OldaleTown_PokemonCenter_2F_Text_277F1B:: @ 8277F1B +CableClub_Text_TradeUsingLinkCable:: @ 8277F1B .string "Trade POKéMON with another player\n" .string "using a GBA Game Link cable.$" -OldaleTown_PokemonCenter_2F_Text_277F5A:: @ 8277F5A +CableClub_Text_BattleUsingLinkCable:: @ 8277F5A .string "You may battle another TRAINER\n" .string "using a GBA Game Link cable.$" -OldaleTown_PokemonCenter_2F_Text_277F96:: @ 8277F96 +CableClub_Text_RecordCornerUsingLinkCable:: @ 8277F96 .string "You can use the RECORD CORNER with\n" .string "others using a GBA Game Link cable.$" @@ -1804,19 +1804,19 @@ OldaleTown_PokemonCenter_2F_Text_27878B: @ 827878B OldaleTown_PokemonCenter_2F_Text_278792: @ 8278792 .string "Please wait.$" -OldaleTown_PokemonCenter_2F_Text_27879F:: @ 827879F +CableClub_Text_YouMayTradeHere:: @ 827879F .string "You may trade your POKéMON here\n" .string "with another TRAINER.$" -OldaleTown_PokemonCenter_2F_Text_2787D5:: @ 82787D5 +CableClub_Text_YouMayBattleHere:: @ 82787D5 .string "You may battle with your friends\n" .string "here.$" -OldaleTown_PokemonCenter_2F_Text_2787FC:: @ 82787FC +CableClub_Text_CanMakeBerryPowder:: @ 82787FC .string "Two to five TRAINERS can make\n" .string "BERRY POWDER together.$" -OldaleTown_PokemonCenter_2F_Text_278831:: @ 8278831 +CableClub_Text_CanMixRecords:: @ 8278831 .string "The records of two to four players\n" .string "can be mixed together.$" @@ -1824,7 +1824,7 @@ OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B .string "A guide to the WIRELESS CLUB's\n" .string "various services.$" -OldaleTown_PokemonCenter_2F_Text_27889C:: @ 827889C +CableClub_Text_CancelSelectedItem:: @ 827889C .string "Cancels the selected MENU item.$" OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index d00e23d77..9a9816a5f 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -43,24 +43,24 @@ LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B LilycoveCity_ContestLobby_EventScript_279D5A:: @ 8279D5A message LilycoveCity_ContestLobby_Text_27AF28 waitmessage - multichoice 0, 0, 2, 0 + multichoice 0, 0, MULTI_ENTERINFO, 0 switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_279E62 case 1, LilycoveCity_ContestLobby_EventScript_279D97 case 2, LilycoveCity_ContestLobby_EventScript_279E09 - case 127, LilycoveCity_ContestLobby_EventScript_279E09 + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09 end LilycoveCity_ContestLobby_EventScript_279D97:: @ 8279D97 message LilycoveCity_ContestLobby_Text_27AF5E waitmessage - multichoice 0, 0, 3, 0 + multichoice 0, 0, MULTI_CONTEST_INFO, 0 switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_279DDF case 1, LilycoveCity_ContestLobby_EventScript_279DED case 2, LilycoveCity_ContestLobby_EventScript_279DFB case 3, LilycoveCity_ContestLobby_EventScript_279D5A - case 127, LilycoveCity_ContestLobby_EventScript_279D5A + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279D5A end LilycoveCity_ContestLobby_EventScript_279DDF:: @ 8279DDF @@ -104,14 +104,14 @@ LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13 LilycoveCity_ContestLobby_EventScript_279E62:: @ 8279E62 message LilycoveCity_ContestLobby_Text_27B3FF waitmessage - multichoice 0, 0, 82, 0 + multichoice 0, 0, MULTI_CONTEST_RANK, 0 switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_279EB5 case 1, LilycoveCity_ContestLobby_EventScript_279EC0 case 2, LilycoveCity_ContestLobby_EventScript_279ECB case 3, LilycoveCity_ContestLobby_EventScript_279ED6 case 4, LilycoveCity_ContestLobby_EventScript_279E09 - case 127, LilycoveCity_ContestLobby_EventScript_279E09 + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09 end LilycoveCity_ContestLobby_EventScript_279EB5:: @ 8279EB5 @@ -137,10 +137,10 @@ LilycoveCity_ContestLobby_EventScript_279ED6:: @ 8279ED6 LilycoveCity_ContestLobby_EventScript_279EE1:: @ 8279EE1 message LilycoveCity_ContestLobby_Text_27B423 waitmessage - multichoice 0, 0, 4, 0 + multichoice 0, 0, MULTI_CONTEST_TYPE, 0 switch VAR_RESULT case 5, LilycoveCity_ContestLobby_EventScript_279E09 - case 127, LilycoveCity_ContestLobby_EventScript_279E09 + case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09 copyvar VAR_CONTEST_CATEGORY, VAR_RESULT goto LilycoveCity_ContestLobby_EventScript_279E13 end @@ -216,19 +216,19 @@ LinkContestRoom1_EventScript_279FF2:: @ 8279FF2 return LinkContestRoom1_EventScript_27A024:: @ 827A024 - setvar VAR_0x8009, 5 + setvar VAR_0x8009, STDSTRING_NORMAL return LinkContestRoom1_EventScript_27A02A:: @ 827A02A - setvar VAR_0x8009, 6 + setvar VAR_0x8009, STDSTRING_SUPER return LinkContestRoom1_EventScript_27A030:: @ 827A030 - setvar VAR_0x8009, 7 + setvar VAR_0x8009, STDSTRING_HYPER return LinkContestRoom1_EventScript_27A036:: @ 827A036 - setvar VAR_0x8009, 8 + setvar VAR_0x8009, STDSTRING_MASTER return LinkContestRoom1_EventScript_27A03C:: @ 827A03C @@ -241,23 +241,23 @@ LinkContestRoom1_EventScript_27A03C:: @ 827A03C return LinkContestRoom1_EventScript_27A079:: @ 827A079 - setvar VAR_0x8008, 0 + setvar VAR_0x8008, CONTEST_CATEGORY_COOL return LinkContestRoom1_EventScript_27A07F:: @ 827A07F - setvar VAR_0x8008, 1 + setvar VAR_0x8008, CONTEST_CATEGORY_BEAUTY return LinkContestRoom1_EventScript_27A085:: @ 827A085 - setvar VAR_0x8008, 2 + setvar VAR_0x8008, CONTEST_CATEGORY_CUTE return LinkContestRoom1_EventScript_27A08B:: @ 827A08B - setvar VAR_0x8008, 3 + setvar VAR_0x8008, CONTEST_CATEGORY_SMART return LinkContestRoom1_EventScript_27A091:: @ 827A091 - setvar VAR_0x8008, 4 + setvar VAR_0x8008, CONTEST_CATEGORY_TOUGH return LinkContestRoom1_EventScript_27A097:: @ 827A097 diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index cc189a96b..c8cb84107 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -8,12 +8,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_291539:: @ 8291539 PetalburgCity_PokemonCenter_1F_EventScript_291552:: @ 8291552 msgbox PetalburgCity_PokemonCenter_1F_Text_2916FF, MSGBOX_DEFAULT - multichoice 17, 6, 20, 0 + multichoice 17, 6, MULTI_YESNOINFO_2, 0 switch VAR_RESULT case 0, PetalburgCity_PokemonCenter_1F_EventScript_29159F case 1, PetalburgCity_PokemonCenter_1F_EventScript_2915EB case 2, PetalburgCity_PokemonCenter_1F_EventScript_291591 - case 127, PetalburgCity_PokemonCenter_1F_EventScript_2915EB + case MULTI_B_PRESSED, PetalburgCity_PokemonCenter_1F_EventScript_2915EB end PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591 @@ -60,12 +60,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_2915F5:: @ 82915F5 PetalburgCity_PokemonCenter_1F_EventScript_291603:: @ 8291603 msgbox PetalburgCity_PokemonCenter_1F_Text_291A4F, MSGBOX_DEFAULT - multichoice 17, 6, 20, 0 + multichoice 17, 6, MULTI_YESNOINFO_2, 0 switch VAR_RESULT case 0, PetalburgCity_PokemonCenter_1F_EventScript_291650 case 1, PetalburgCity_PokemonCenter_1F_EventScript_29167C case 2, PetalburgCity_PokemonCenter_1F_EventScript_291642 - case 127, PetalburgCity_PokemonCenter_1F_EventScript_29167C + case MULTI_B_PRESSED, PetalburgCity_PokemonCenter_1F_EventScript_29167C end PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 438355c31..149fb52cc 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -507,7 +507,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D9D msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, MSGBOX_DEFAULT - multichoice 22, 8, 108, 1 + multichoice 22, 8, MULTI_TV_LATI, 1 copyvar VAR_0x8004, VAR_RESULT special InitRoamer copyvar VAR_ROAMER_POKEMON, VAR_RESULT diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 3269ec233..10ced77c4 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -714,12 +714,12 @@ LilycoveCity_ContestLobby_EventScript_2941ED: @ 82941ED EventScript_PblocLink_DecideLeader: @ 82941F8 message Text_DecideLinkLeader waitmessage - multichoice 16, 6, 81, 0 + multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT case 0, EventScript_PblocLink_TryJoinGroup case 1, EventScript_PblocLink_TryBecomeLeader case 2, EventScript_PblocLink_CloseLink - case 127, EventScript_PblocLink_CloseLink + case MULTI_B_PRESSED, EventScript_PblocLink_CloseLink end EventScript_PblocLink_TryBecomeLeader: @ 8294235 diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index c205a9d22..21ba0d6d3 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -26,7 +26,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A compare VAR_RESULT, 0 goto_if_ne EventScript_NoDoubleTrainerBattle special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_NotEnoughMonsForDoubleBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement @@ -69,7 +69,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8 compare VAR_RESULT, 0 goto_if_eq EventScript_NoDoubleRematchTrainerBattle special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement diff --git a/data/specials.inc b/data/specials.inc index fd5957356..fadf24d04 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -273,7 +273,7 @@ gSpecials:: @ 81DBA64 def_special ShowBerryBlenderRecordWindow def_special ResetTrickHouseEndRoomFlag def_special SetTrickHouseEndRoomFlag - def_special ScrSpecial_CreatePCMenu + def_special ScriptMenu_CreatePCMultichoice def_special AccessHallOfFamePC def_special Special_ShowDiploma def_special CheckLeadMonCool @@ -480,7 +480,7 @@ gSpecials:: @ 81DBA64 def_special ShowFrontierGamblerGoMessage def_special Script_DoRayquazaScene def_special sub_81C72A4 - def_special sp106_CreateStartMenu + def_special ScriptMenu_CreateStartMenuForPokenavTutorial def_special CountPlayerTrainerStars def_special BufferBattleFrontierTutorMoveName def_special CloseBattleFrontierTutorWindow @@ -508,8 +508,8 @@ gSpecials:: @ 81DBA64 def_special sub_813B4E0 def_special ShouldDoBrailleRegicePuzzle def_special EnableNationalPokedex - def_special sub_80E2548 - def_special sub_80E2878 + def_special ScriptMenu_CreateLilycoveSSTidalMultichoice + def_special GetLilycoveSSTidalSelection def_special TurnOnTVScreen def_special sub_81D4A90 def_special sub_813B514 diff --git a/data/text/eon_ticket.inc b/data/text/event_ticket_1.inc index d436f2df1..da4d525f6 100644 --- a/data/text/eon_ticket.inc +++ b/data/text/event_ticket_1.inc @@ -1,16 +1,16 @@ -LilycoveCity_Harbor_Text_2A6848: @ 82A6848 +EventTicket_Text_ShowOldSeaMap: @ 82A6848 .string "The ferry to SLATEPORT is…\p" .string "I beg your pardon?\n" .string "Can we sail to this place on the map?\p" .string "I know someone who will help you better.\n" .string "Please wait.$" -LilycoveCity_Harbor_Text_2A68D2: @ 82A68D2 +EventTicket_Text_ThatPass: @ 82A68D2 .string "The ferry to SLATEPORT is…\p" .string "Oh?\n" .string "That PASS…$" -LilycoveCity_Harbor_Text_2A68FC: @ 82A68FC +EventTicket_Text_ShowEonTicket: @ 82A68FC .string "Aye, mate, are you the one who brought\n" .string "that mighty odd PASS?\p" .string "I'll tell you, you're trying to reach a\n" @@ -20,29 +20,22 @@ LilycoveCity_Harbor_Text_2A68FC: @ 82A68FC .string "That shivers my timbers!\p" .string "All aboard!$" -SouthernIsland_Exterior_Text_2A69F1: @ 82A69F1 +EventTicket_Text_SouthernIslandSailBack: @ 82A69F1 .string "Aye, mate, there's nothing here to\n" .string "see or do on this forgettable island.\p" .string "What say we sail back to LILYCOVE?$" -BirthIsland_Harbor_Text_2A6A5D: @ 82A6A5D -FarawayIsland_Entrance_Text_2A6A5D: @ 82A6A5D -NavelRock_Harbor_Text_2A6A5D: @ 82A6A5D -SouthernIsland_Exterior_Text_2A6A5D: @ 82A6A5D +EventTicket_Text_SailHome: @ 82A6A5D .string "Aye, right, then!\n" .string "Sail home we will!$" -BirthIsland_Harbor_Text_2A6A82: @ 82A6A82 -FarawayIsland_Entrance_Text_2A6A82: @ 82A6A82 -LilycoveCity_Harbor_Text_2A6A82: @ 82A6A82 -NavelRock_Harbor_Text_2A6A82: @ 82A6A82 -SouthernIsland_Exterior_Text_2A6A82: @ 82A6A82 +EventTicket_Text_AsYouLike: @ 82A6A82 .string "Aye, right, as you like, then.$" -SouthernIsland_Interior_Text_2A6AA1: @ 82A6AA1 +SouthernIsland_Interior_Text_Sign: @ 82A6AA1 .string "“All dreams are but another reality.\n" .string "Never forget…”$" -SouthernIsland_Exterior_Text_2A6AD5: @ 82A6AD5 +SouthernIsland_Exterior_Text_Sign: @ 82A6AD5 .string "“Those whose memories fade seek to\n" .string "carve them in their hearts…”$" diff --git a/data/text/event_ticket_2.inc b/data/text/event_ticket_2.inc new file mode 100644 index 000000000..e081edbd9 --- /dev/null +++ b/data/text/event_ticket_2.inc @@ -0,0 +1,71 @@ +EventTicket_Text_OldSeaMapTooFar: @ 82C68A5 + .string "What's up, youngster?\p" + .string "What, it's you who's supposed to have\n" + .string "a tattered old map?\p" + .string "Let's have a look.\n" + .string "… … … … … …\p" + .string "Boy, this is quite a ways away.\n" + .string "I'm afraid I can't help you…$" + +EventTicket_Text_BrineyHoldOnASecond: @ 82C6951 + .string "BRINEY: Hold on a second!\p" + .string "What's the idea of turning down\n" + .string "someone that I owe so much to?$" + +EventTicket_Text_BrineyLetsSail: @ 82C69AA + .string "{PLAYER}{KUN}, I'm terribly sorry.\p" + .string "You came to me seeking my help,\n" + .string "and we almost turned you away.\p" + .string "Well, let me make things right.\p" + .string "We'll sail right away, of course!\p" + .string "Let's find this island on\n" + .string "this OLD SEA MAP!$" + +EventTicket_Text_OddTicketGetOnBoard: @ 82C6A71 + .string "Is it you who brought that odd\n" + .string "ticket?\p" + .string "Where you're trying to go is an island\n" + .string "that's far, far away.\p" + .string "No one knows what awaits there…\p" + .string "The very thought excites my blood\n" + .string "as a sailing man!\p" + .string "Get on board, youngster!$" + +FarawayIsland_Entrance_Text_SailorReturn: @ 82C6B42 + .string "CAPT. BRINEY can be so maddeningly\n" + .string "fickle…\p" + .string "Do you want to return to LILYCOVE?$" + +BirthIsland_Harbor_Text_SailorReturn: @ 82C6B90 + .string "What an oddly shaped island, eh?\n" + .string "Do you want to return to LILYCOVE?$" + +EventTicket_Text_OddTicketsWhereTo: @ 82C6BD4 + .string "Is it you who brought those\n" + .string "odd tickets?\p" + .string "… … …Hm.\p" + .string "These tickets will get you to islands\n" + .string "that are far, far away.\p" + .string "No one knows what awaits there,\n" + .string "or what may happen there.\p" + .string "The very thought excites my blood\n" + .string "as a sailing man!\p" + .string "Get on board, youngster!\n" + .string "Where shall we sail first?$" + +NavelRock_Harbor_Text_SailorReturn: @ 82C6CE6 + .string "Did… Did you hear that?\n" + .string "That low growling from deep in there.\p" + .string "Are you sure it's safe?\n" + .string "Do you think we should leave?$" + +FarawayIsland_Entrance_Text_Sign: @ 82C6D5A + .string "The writing is fading as if it was\n" + .string "written a long time ago…\p" + .string "“…ber, 6th day\n" + .string "If any human…sets foot here…\l" + .string "again…et it be a kindhearted pers…\l" + .string "…ith that hope, I depar…”$" + +FarawayIsland_Interior_Text_Mew: @ 82C6DFF + .string "Myuu…$" |