diff options
Diffstat (limited to 'data/maps')
17 files changed, 45 insertions, 45 deletions
diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index ea213a771..6df635f1a 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -7,7 +7,7 @@ BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7 message Text_181726 waitmessage setvar VAR_0x8004, SEAGALLOP_BIRTH_ISLAND - multichoice 20, 8, 61, 0 + multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE switch VAR_RESULT case 0, EventScript_1A91D5 case 1, EventScript_1A90F6 diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 3ffdd24f6..a18215910 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -68,7 +68,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 message Text_1965F4 waitmessage setvar VAR_0x8004, 4 - multichoice 0, 0, 43, 0 + multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE switch VAR_RESULT case 0, EventScript_16C5C0 case 1, EventScript_16C5CE @@ -80,7 +80,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 EventScript_16C578:: @ 816C578 message Text_1965F4 waitmessage - multichoice 0, 0, 43, 0 + multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE switch VAR_RESULT case 0, EventScript_16C5C0 case 1, EventScript_16C5CE diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 0e2673614..3fcd14e8a 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -21,29 +21,29 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 end EventScript_16C1B7:: @ 816C1B7 - multichoicedefault 0, 0, 31, 0, 0 + multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 0, FALSE goto EventScript_16C1F3 EventScript_16C1C2:: @ 816C1C2 end EventScript_16C1C3:: @ 816C1C3 - multichoicedefault 0, 0, 31, 1, 0 + multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 1, FALSE goto EventScript_16C1F3 end EventScript_16C1CF:: @ 816C1CF - multichoicedefault 0, 0, 31, 2, 0 + multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 2, FALSE goto EventScript_16C1F3 end EventScript_16C1DB:: @ 816C1DB - multichoicedefault 0, 0, 31, 3, 0 + multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 3, FALSE goto EventScript_16C1F3 end EventScript_16C1E7:: @ 816C1E7 - multichoicedefault 0, 0, 31, 4, 0 + multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 4, FALSE goto EventScript_16C1F3 end diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 805775505..6e5c8a284 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -58,7 +58,7 @@ EventScript_16BD3E:: @ 816BD3E end EventScript_16BDAE:: @ 816BDAE - multichoice 0, 0, 32, 0 + multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER, FALSE switch VAR_RESULT case 0, EventScript_16BF19 case 1, EventScript_16C00C @@ -66,7 +66,7 @@ EventScript_16BDAE:: @ 816BDAE end EventScript_16BDDA:: @ 816BDDA - multichoice 0, 0, 33, 0 + multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP, FALSE switch VAR_RESULT case 0, EventScript_16BF3A case 1, EventScript_16C00C @@ -74,7 +74,7 @@ EventScript_16BDDA:: @ 816BDDA end EventScript_16BE06:: @ 816BE06 - multichoice 0, 0, 34, 0 + multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP, FALSE switch VAR_RESULT case 0, EventScript_16BF19 case 1, EventScript_16BF3A @@ -83,7 +83,7 @@ EventScript_16BE06:: @ 816BE06 end EventScript_16BE3D:: @ 816BE3D - multichoice 0, 0, 35, 0 + multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_LEMONADE, FALSE switch VAR_RESULT case 0, EventScript_16BF5B case 1, EventScript_16C00C @@ -91,7 +91,7 @@ EventScript_16BE3D:: @ 816BE3D end EventScript_16BE69:: @ 816BE69 - multichoice 0, 0, 36, 0 + multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_LEMONADE, FALSE switch VAR_RESULT case 0, EventScript_16BF19 case 1, EventScript_16BF5B @@ -100,7 +100,7 @@ EventScript_16BE69:: @ 816BE69 end EventScript_16BEA0:: @ 816BEA0 - multichoice 0, 0, 37, 0 + multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP_LEMONADE, FALSE switch VAR_RESULT case 0, EventScript_16BF3A case 1, EventScript_16BF5B @@ -109,7 +109,7 @@ EventScript_16BEA0:: @ 816BEA0 end EventScript_16BED7:: @ 816BED7 - multichoice 0, 0, 38, 0 + multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP_LEMONADE, FALSE switch VAR_RESULT case 0, EventScript_16BF19 case 1, EventScript_16BF3A @@ -220,7 +220,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 end EventScript_16C045:: @ 816C045 - multichoice 12, 0, 26, 0 + multichoice 12, 0, MULTICHOICE_CELADON_VENDING_MACHINE, FALSE copyvar VAR_0x4001, VAR_RESULT switch VAR_0x4001 case 0, EventScript_16C083 diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index dd528c1ec..487d9fa64 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -29,7 +29,7 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D showcoinsbox 0, 5 message Text_196984 waitmessage - multichoice 13, 0, 27, 0 + multichoice 13, 0, MULTICHOICE_GAME_CORNER_COIN_PURCHASE_COUNTER, FALSE copyvar VAR_0x8009, VAR_RESULT switch VAR_RESULT case 0, EventScript_16C6E6 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 70d9121eb..01ad2b414 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -25,7 +25,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 EventScript_16CBB2:: @ 816CBB2 message Text_19707A waitmessage - multichoice 11, 0, 14, 0 + multichoice 11, 0, MULTICHOICE_GAME_CORNER_POKEMON_PRIZES, FALSE switch VAR_RESULT case 0, EventScript_16CC15 case 1, EventScript_16CC25 @@ -204,7 +204,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D EventScript_16CE47:: @ 816CE47 message Text_19707A waitmessage - multichoice 11, 0, 30, 0 + multichoice 11, 0, MULTICHOICE_GAME_CORNER_TMPRIZES, FALSE switch VAR_RESULT case 0, EventScript_16CEA5 case 1, EventScript_16CEB9 @@ -302,7 +302,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 EventScript_16CFB2:: @ 816CFB2 message Text_19707A waitmessage - multichoice 10, 0, 41, 0 + multichoice 10, 0, MULTICHOICE_GAME_CORNER_BATTLE_ITEM_PRIZES, FALSE switch VAR_RESULT case 0, EventScript_16D010 case 1, EventScript_16D020 diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 1091e75cb..40302e25f 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -11,7 +11,7 @@ CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD showmoneybox 0, 0, 0 message Text_192755 waitmessage - multichoice 11, 0, 13, 0 + multichoice 11, 0, MULTICHOICE_BIKE_SHOP, FALSE switch VAR_RESULT case 0, EventScript_16AC07 case 1, EventScript_16AC15 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index ad8b416cd..27fb47f63 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -103,7 +103,7 @@ EventScript_16E544:: @ 816E544 call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16E5FA - multichoice 0, 0, 21, 0 + multichoice 0, 0, MULTICHOICE_HELIX, FALSE switch VAR_RESULT case 0, EventScript_16E668 case 1, EventScript_16E53A @@ -116,7 +116,7 @@ EventScript_16E586:: @ 816E586 call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16E631 - multichoice 0, 0, 22, 0 + multichoice 0, 0, MULTICHOICE_DOME, FALSE switch VAR_RESULT case 0, EventScript_16E6A6 case 1, EventScript_16E53A @@ -126,7 +126,7 @@ EventScript_16E586:: @ 816E586 EventScript_16E5C8:: @ 816E5C8 message Text_19A282 waitmessage - multichoice 0, 0, 23, 0 + multichoice 0, 0, MULTICHOICE_AMBER, FALSE switch VAR_RESULT case 0, EventScript_16E6E4 case 1, EventScript_16E53A @@ -134,7 +134,7 @@ EventScript_16E5C8:: @ 816E5C8 end EventScript_16E5FA:: @ 816E5FA - multichoice 0, 0, 24, 0 + multichoice 0, 0, MULTICHOICE_HELIX_AMBER, FALSE switch VAR_RESULT case 0, EventScript_16E668 case 1, EventScript_16E6E4 @@ -143,7 +143,7 @@ EventScript_16E5FA:: @ 816E5FA end EventScript_16E631:: @ 816E631 - multichoice 0, 0, 25, 0 + multichoice 0, 0, MULTICHOICE_DOME_AMBER, FALSE switch VAR_RESULT case 0, EventScript_16E6A6 case 1, EventScript_16E6E4 diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 8cb8dd796..60832d168 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -8,7 +8,7 @@ NavelRock_Harbor_EventScript_165421:: @ 8165421 message Text_181726 waitmessage setvar VAR_0x8004, SEAGALLOP_NAVEL_ROCK - multichoice 20, 8, 61, 0 + multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE switch VAR_RESULT case 0, EventScript_1A91D5 case 1, EventScript_1A90F6 diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 8a3bdd640..8d4f9dc6d 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -190,9 +190,9 @@ PewterCity_Museum_1F_EventScript_16A512:: @ 816A512 setvar VAR_0x8004, SPECIES_AERODACTYL setvar VAR_0x8005, 10 setvar VAR_0x8006, 3 - special sub_809D504 + special Special_OpenMuseumFossilPic msgbox gUnknown_8190945 - special sub_809D620 + special Special_CloseMuseumFossilPic releaseall end @@ -201,8 +201,8 @@ PewterCity_Museum_1F_EventScript_16A532:: @ 816A532 setvar VAR_0x8004, SPECIES_KABUTOPS setvar VAR_0x8005, 10 setvar VAR_0x8006, 3 - special sub_809D504 + special Special_OpenMuseumFossilPic msgbox gUnknown_8190975 - special sub_809D620 + special Special_CloseMuseumFossilPic releaseall end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index c6a199a52..2b593b1bb 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -21,21 +21,21 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 end EventScript_161530:: @ 8161530 - multichoicedefault 0, 0, 42, 0, 0 + multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 0, FALSE goto EventScript_161554 EventScript_16153B:: @ 816153B end EventScript_16153C:: @ 816153C - multichoicedefault 0, 0, 42, 1, 0 + multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 1, FALSE goto EventScript_161554 EventScript_161547:: @ 8161547 end EventScript_161548:: @ 8161548 - multichoicedefault 0, 0, 42, 2, 0 + multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 2, FALSE goto EventScript_161554 EventScript_161553:: @ 8161553 diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 76be366f2..e8d016a02 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -248,7 +248,7 @@ EventScript_1707CA:: @ 81707CA EventScript_1707D8:: @ 81707D8 message Text_1A0479 waitmessage - multichoice 0, 0, 1, 0 + multichoice 0, 0, MULTICHOICE_EEVEELUTIONS, FALSE switch VAR_RESULT case 0, EventScript_17082B case 1, EventScript_170840 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index a415190da..e8ee2450f 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -20,12 +20,12 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 end EventScript_164B46:: @ 8164B46 - multichoicedefault 0, 0, 20, 0, 0 + multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE goto EventScript_164B5E end EventScript_164B52:: @ 8164B52 - multichoicedefault 0, 0, 20, 1, 0 + multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE goto EventScript_164B5E end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 24f2fd622..142f33ee3 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -169,7 +169,7 @@ EventScript_164A00:: @ 8164A00 EventScript_164A08:: @ 8164A08 message Text_17C88D waitmessage - multichoice 18, 6, 16, 0 + multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE switch VAR_RESULT case 0, EventScript_164A53 case 1, EventScript_164ABF @@ -183,7 +183,7 @@ EventScript_164A45:: @ 8164A45 end EventScript_164A53:: @ 8164A53 - multichoice 13, 3, 64, 0 + multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE switch VAR_RESULT case 0, EventScript_164AA0 case 1, EventScript_164AA0 diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 33f6d42fd..40c68cb7e 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -98,7 +98,7 @@ EventScript_171741:: @ 8171741 EventScript_17175B:: @ 817175B message Text_1A2D43 waitmessage - multichoice 0, 0, 51, 1 + multichoice 0, 0, MULTICHOICE_MUSHROOMS, TRUE switch VAR_RESULT case 0, EventScript_171741 case 1, EventScript_171727 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index d1d312add..fcacff2e3 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -110,7 +110,7 @@ EventScript_1669FD:: @ 81669FD call_if FALSE, EventScript_166A53 message Text_17FCC1 waitmessage - multichoice 17, 6, 54, 0 + multichoice 17, 6, MULTICHOICE_SEVII_NAVEL, FALSE switch VAR_RESULT case 0, EventScript_1A911E case 1, EventScript_166B0B @@ -128,7 +128,7 @@ EventScript_166A5F:: @ 8166A5F call_if FALSE, EventScript_166AA5 message Text_17FCC1 waitmessage - multichoice 13, 6, 55, 0 + multichoice 13, 6, MULTICHOICE_SEVII_BIRTH, FALSE switch VAR_RESULT case 0, EventScript_1A911E case 1, EventScript_166B23 @@ -148,7 +148,7 @@ EventScript_166AB1:: @ 8166AB1 call_if FALSE, EventScript_166AA5 message Text_17FCC1 waitmessage - multichoice 13, 5, 56, 0 + multichoice 13, 5, MULTICHOICE_SEVII_NAVEL_BIRTH, FALSE switch VAR_RESULT case 0, EventScript_1A911E case 1, EventScript_166B0B @@ -175,7 +175,7 @@ EventScript_166B3B:: @ 8166B3B message Text_17FB23 waitmessage setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY - multichoice 19, 5, 57, 0 + multichoice 19, 5, MULTICHOICE_SEAGALLOP_123, FALSE switch VAR_RESULT case 0, EventScript_1A8FEE case 1, EventScript_1A8FF9 diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index a31719b55..1c25dd3e4 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -56,7 +56,7 @@ ViridianCity_House2_EventScript_16A11D:: @ 816A11D EventScript_16A12C:: @ 816A12C message Text_18FF88 waitmessage - multichoicegrid 7, 1, 15, 3, 0 + multichoicegrid 7, 1, MULTICHOICE_TRAINER_SCHOOL_WHITEBOARD, 3, FALSE switch VAR_RESULT case 0, EventScript_16A18B case 1, EventScript_16A1A7 |