diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-25 14:52:54 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-25 14:52:54 -0400 |
commit | 359ec8dde1d069b8b335e863f332f65c262c9145 (patch) | |
tree | e64a918ac443fa1de6d2c6500f048fc8fb5913f3 | |
parent | 15298c6cd152ebbe8dcf30fd9dcc384b7da02d19 (diff) |
Name multichoice menus
22 files changed, 355 insertions, 291 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index ccb9c9446..bfa50b73f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -24,9 +24,9 @@ .section script_data, "aw", %progbits - .include "data/script_cmd_table.inc" + .include "data/script_cmd_table.inc" - .align 2 + .align 2 gSpecialVars:: @ 815FD0C .4byte gSpecialVar_0x8000 .4byte gSpecialVar_0x8001 @@ -50,9 +50,9 @@ gSpecialVars:: @ 815FD0C .4byte gSpecialVar_PrevTextColor .4byte gUnknown_20370DE - .include "data/specials.inc" + .include "data/specials.inc" - .align 2 + .align 2 gStdScripts:: @ 8160450 .4byte gStdScript_0 .4byte gStdScript_1 @@ -1593,7 +1593,7 @@ EventScript_1A6578:: @ 81A6578 goto_if eq, EventScript_1A7AE0 message Text_1A5483 waitmessage - multichoice 19, 8, 0, 2 + multichoice 19, 8, MULTICHOICE_YES_NO, FALSE | (TRUE << 1) switch VAR_RESULT case 0, EventScript_1A65B8 case 1 EventScript_1A6663 @@ -4160,7 +4160,7 @@ EventScript_1A8EC5:: @ 81A8EC5 goto_if ge, EventScript_1A911E compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if ge, EventScript_1A8F12 - multichoice 19, 6, 44, 0 + multichoice 19, 6, MULTICHOICE_ISLAND_23, FALSE switch VAR_RESULT case 0, EventScript_1A8FF9 case 1, EventScript_1A9004 @@ -4169,7 +4169,7 @@ EventScript_1A8EC5:: @ 81A8EC5 end EventScript_1A8F12:: @ 81A8F12 - multichoice 19, 5, 58, 0 + multichoice 19, 5, MULTICHOICE_SEA_GALLOP_V23, FALSE switch VAR_RESULT case 0, EventScript_1A8FE3 case 1, EventScript_1A8FF9 @@ -4183,7 +4183,7 @@ EventScript_1A8F54:: @ 81A8F54 goto_if ge, EventScript_1A911E compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if ge, EventScript_1A8FA1 - multichoice 19, 6, 45, 0 + multichoice 19, 6, MULTICHOICE_ISLAND_13, FALSE switch VAR_RESULT case 0, EventScript_1A8FEE case 1, EventScript_1A9004 @@ -4192,7 +4192,7 @@ EventScript_1A8F54:: @ 81A8F54 end EventScript_1A8FA1:: @ 81A8FA1 - multichoice 19, 5, 59, 0 + multichoice 19, 5, MULTICHOICE_SEA_GALLOP_V13, FALSE switch VAR_RESULT case 0, EventScript_1A8FE3 case 1, EventScript_1A8FEE @@ -4226,7 +4226,7 @@ EventScript_1A900F:: @ 81A900F goto_if ge, EventScript_1A911E compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if ge, EventScript_1A905C - multichoice 19, 6, 46, 0 + multichoice 19, 6, MULTICHOICE_ISLAND_12, FALSE switch VAR_RESULT case 0, EventScript_1A8FEE case 1, EventScript_1A8FF9 @@ -4235,7 +4235,7 @@ EventScript_1A900F:: @ 81A900F end EventScript_1A905C:: @ 81A905C - multichoice 19, 5, 60, 0 + multichoice 19, 5, MULTICHOICE_SEA_GALLOP_V12, FALSE switch VAR_RESULT case 0, EventScript_1A8FE3 case 1, EventScript_1A8FEE @@ -7877,7 +7877,7 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867 waitse message gUnknown_81B1E24 waitmessage - multichoice 21, 0, 2, 1 + multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE switch VAR_RESULT case 0, EventScript_1B28DB case 1, EventScript_1B28E6 @@ -8003,7 +8003,7 @@ EventScript_1B29D0:: @ 81B29D0 end EventScript_1B2A23:: @ 81B2A23 - multichoice 15, 8, 3, 0 + multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE switch VAR_RESULT case 0, EventScript_1B2B98 case 1, EventScript_1B2DF6 @@ -8011,7 +8011,7 @@ EventScript_1B2A23:: @ 81B2A23 end EventScript_1B2A4F:: @ 81B2A4F - multichoice 16, 8, 4, 0 + multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE switch VAR_RESULT case 0, EventScript_1B2C62 case 1, EventScript_1B2DF6 @@ -8019,7 +8019,7 @@ EventScript_1B2A4F:: @ 81B2A4F end EventScript_1B2A7B:: @ 81B2A7B - multichoice 15, 8, 5, 0 + multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE switch VAR_RESULT case 0, EventScript_1B2D2C case 1, EventScript_1B2DF6 @@ -8027,7 +8027,7 @@ EventScript_1B2A7B:: @ 81B2A7B end EventScript_1B2AA7:: @ 81B2AA7 - multichoice 15, 6, 6, 0 + multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE switch VAR_RESULT case 0, EventScript_1B2B98 case 1, EventScript_1B2C62 @@ -8036,7 +8036,7 @@ EventScript_1B2AA7:: @ 81B2AA7 end EventScript_1B2ADE:: @ 81B2ADE - multichoice 15, 6, 7, 0 + multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE switch VAR_RESULT case 0, EventScript_1B2B98 case 1, EventScript_1B2D2C @@ -8045,7 +8045,7 @@ EventScript_1B2ADE:: @ 81B2ADE end EventScript_1B2B15:: @ 81B2B15 - multichoice 15, 6, 8, 0 + multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE switch VAR_RESULT case 0, EventScript_1B2C62 case 1, EventScript_1B2D2C @@ -8054,7 +8054,7 @@ EventScript_1B2B15:: @ 81B2B15 end EventScript_1B2B4C:: @ 81B2B4C - multichoice 15, 5, 9, 0 + multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE switch VAR_RESULT case 0, EventScript_1B2B98 case 1, EventScript_1B2C62 @@ -8369,16 +8369,14 @@ ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED - multichoice 64, 1, 0, 39 - showelevmenu - compare_local_to_local 8, 111 - setdivewarp MAP_NAVEL_ROCK_EXTERIOR, 39, 7090, 28424 - setdivewarp MAP_VIRIDIAN_CITY_HOUSE1, 39, 7090, 28424 - setdivewarp MAP_PALLET_TOWN, 39, 7090, 28424 - setdivewarp MAP_PEWTER_CITY_MUSEUM_1F, 39, 7090, 28424 - setdivewarp MAP_CERULEAN_CITY_HOUSE1, 39, 7090, 28424 - setdivewarp MAP_LAVENDER_TOWN_POKEMON_CENTER_1F, 39, 7090, 8 - nop + map_script_2 VAR_0x406F, 1, EventScript_1BB227 + map_script_2 VAR_0x406F, 2, EventScript_1BB227 + map_script_2 VAR_0x406F, 5, EventScript_1BB227 + map_script_2 VAR_0x406F, 3, EventScript_1BB227 + map_script_2 VAR_0x406F, 6, EventScript_1BB227 + map_script_2 VAR_0x406F, 7, EventScript_1BB227 + map_script_2 VAR_0x406F, 8, EventScript_1BB227 + .2byte 0 EventScript_1BB227:: @ 81BB227 compare_var_to_value VAR_0x8007, 0 @@ -8608,7 +8606,7 @@ EventScript_1BB459:: @ 81BB459 EventScript_1BB467:: @ 81BB467 setvar VAR_0x8004, 0 - multichoice 0, 0, 39, 0 + multichoice 0, 0, MULTICHOICE_TRADE_CENTER_COLOSSEUM, FALSE switch VAR_RESULT case 0, EventScript_1BB6AB case 1, EventScript_1BB4A3 @@ -8626,7 +8624,7 @@ EventScript_1BB4AD:: @ 81BB4AD EventScript_1BB4AE:: @ 81BB4AE message Text_1BD338 waitmessage - multichoice 0, 0, 17, 0 + multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE switch VAR_RESULT case 0, EventScript_1BB50F case 1, EventScript_1BB51A @@ -9199,7 +9197,7 @@ EventScript_1BBA50:: @ 81BBA50 end EventScript_1BBA51:: @ 81BBA51 - multichoice 18, 6, 16, 0 + multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE switch VAR_RESULT case 0, EventScript_1BBA94 case 1, EventScript_1BB82F @@ -9323,7 +9321,7 @@ EventScript_1BBBE6:: @ 81BBBE6 EventScript_1BBBE7:: @ 81BBBE7 checkflag FLAG_GOT_POWDER_JAR goto_if FALSE, EventScript_1BBC32 - multichoice 0, 0, 47, 0 + multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_CRUSH, FALSE switch VAR_RESULT case 0, EventScript_1BBC69 case 1, EventScript_1BBC97 @@ -9333,7 +9331,7 @@ EventScript_1BBBE7:: @ 81BBBE7 end EventScript_1BBC32:: @ 81BBC32 - multichoice 0, 0, 50, 0 + multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_2, FALSE switch VAR_RESULT case 0, EventScript_1BBC69 case 1, EventScript_1BBC97 @@ -9357,7 +9355,7 @@ EventScript_1BBC96:: @ 81BBC96 EventScript_1BBC97:: @ 81BBC97 message Text_1BD338 waitmessage - multichoice 0, 0, 17, 0 + multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE switch VAR_RESULT case 0, EventScript_1BBCEA case 1, EventScript_1BBCF5 @@ -9442,7 +9440,7 @@ EventScript_1BBDBC:: @ 81BBDBC message Text_1BD51B waitmessage call EventScript_1A6675 - multichoice 13, 6, 63, 0 + multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT case 0, EventScript_1BBE28 case 1, EventScript_1BBE00 @@ -9477,7 +9475,7 @@ EventScript_1BBE50:: @ 81BBE50 message Text_1BD582 waitmessage call EventScript_1A6675 - multichoice 13, 6, 63, 0 + multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT case 0, EventScript_1BBEBC case 1, EventScript_1BBE94 @@ -9512,7 +9510,7 @@ EventScript_1BBEE4:: @ 81BBEE4 message Text_1BD5F1 waitmessage call EventScript_1A6675 - multichoice 13, 6, 63, 0 + multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT case 0, EventScript_1BBF50 case 1, EventScript_1BBF28 @@ -9659,7 +9657,7 @@ EventScript_1BC060:: @ 81BC060 faceplayer message Text_1BCCFF waitmessage - multichoice 0, 0, 49, 0 + multichoice 0, 0, MULTICHOICE_POKEJUMP_DODRIO, FALSE switch VAR_RESULT case 0, EventScript_1BC0B0 case 1, EventScript_1BC0BA @@ -9698,7 +9696,7 @@ EventScript_1BC0CE:: @ 81BC0CE special HelpSystem_Disable message Text_1BD02D waitmessage - multichoice 0, 0, 49, 0 + multichoice 0, 0, MULTICHOICE_POKEJUMP_DODRIO, FALSE switch VAR_RESULT case 0, EventScript_1BC13A case 1, EventScript_1BC184 @@ -9751,7 +9749,7 @@ EventScript_1BC1CE:: @ 81BC1CE message Text_1BD5F1 waitmessage call EventScript_1A6675 - multichoice 13, 6, 63, 0 + multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT case 0, EventScript_1BC23A case 1, EventScript_1BC212 @@ -11303,7 +11301,7 @@ EventScript_1BEE3A:: @ 81BEE3A EventScript_1BEE44:: @ 81BEE44 message Text_1BF017 waitmessage - multichoice 18, 6, 18, 0 + multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE switch VAR_RESULT case 0, EventScript_1BEE8F case 1, EventScript_1BEEC3 @@ -11350,7 +11348,7 @@ EventScript_1BEECD:: @ 81BEECD EventScript_1BEEDB:: @ 81BEEDB message Text_1BF1FB waitmessage - multichoice 18, 6, 18, 0 + multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE switch VAR_RESULT case 0, EventScript_1BEF26 case 1, EventScript_1BEF35 @@ -13429,7 +13427,7 @@ VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE goto_if eq, EventScript_1C4802 setflag FLAG_TUTOR_DOUBLE_EDGE goto EventScript_1C480C - end + end EventScript_1C4802:: @ 81C4802 msgbox Text_174ABC @@ -13459,7 +13457,7 @@ EventScript_1C4816:: @ 81C4816 goto_if eq, EventScript_1C486A setflag FLAG_TUTOR_THUNDER_WAVE goto EventScript_1C4874 - end + end EventScript_1C486A:: @ 81C486A msgbox Text_17579D @@ -13489,7 +13487,7 @@ RockTunnel_B1F_EventScript_1C487E:: @ 81C487E goto_if eq, EventScript_1C48D2 setflag FLAG_TUTOR_ROCK_SLIDE goto EventScript_1C48DC - end + end EventScript_1C48D2:: @ 81C48D2 msgbox Text_179AC0 @@ -13519,7 +13517,7 @@ MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6 goto_if eq, EventScript_1C493A setflag FLAG_TUTOR_EXPLOSION goto EventScript_1C4944 - end + end EventScript_1C493A:: @ 81C493A msgbox Text_17A6ED @@ -13549,7 +13547,7 @@ Route4_EventScript_1C494E:: @ 81C494E goto_if eq, EventScript_1C49A2 setflag FLAG_TUTOR_META_PUNCH goto EventScript_1C49AC - end + end EventScript_1C49A2:: @ 81C49A2 msgbox Text_183A83 @@ -13579,7 +13577,7 @@ Route4_EventScript_1C49B6:: @ 81C49B6 goto_if eq, EventScript_1C4A0A setflag FLAG_TUTOR_MEGA_KICK goto EventScript_1C4A14 - end + end EventScript_1C4A0A:: @ 81C4A0A msgbox Text_183C25 @@ -13609,7 +13607,7 @@ EventScript_1C4A1E:: @ 81C4A1E goto_if eq, EventScript_1C4A72 setflag FLAG_TUTOR_DREAM_EATER goto EventScript_1C4A7C - end + end EventScript_1C4A72:: @ 81C4A72 msgbox Text_17E3E9 @@ -13639,7 +13637,7 @@ EventScript_1C4A86:: @ 81C4A86 goto_if eq, EventScript_1C4ADA setflag FLAG_TUTOR_SOFT_BOILED goto EventScript_1C4AE4 - end + end EventScript_1C4ADA:: @ 81C4ADA msgbox Text_18043F @@ -13669,7 +13667,7 @@ FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE goto_if eq, EventScript_1C4B42 setflag FLAG_TUTOR_SUBSTITUTE goto EventScript_1C4B4C - end + end EventScript_1C4B42:: @ 81C4B42 msgbox Text_180A32 @@ -13699,7 +13697,7 @@ SevenIsland_EventScript_1C4B56:: @ 81C4B56 goto_if eq, EventScript_1C4BAA setflag FLAG_TUTOR_SWORDS_DANCE goto EventScript_1C4BB4 - end + end EventScript_1C4BAA:: @ 81C4BAA msgbox Text_182FC1 @@ -13729,7 +13727,7 @@ PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE goto_if eq, EventScript_1C4C12 setflag FLAG_TUTOR_SEISMIC_TOSS goto EventScript_1C4C1C - end + end EventScript_1C4C12:: @ 81C4C12 msgbox Text_190AA9 @@ -13759,7 +13757,7 @@ EventScript_1C4C26:: @ 81C4C26 goto_if eq, EventScript_1C4C7A setflag FLAG_TUTOR_COUNTER goto EventScript_1C4C84 - end + end EventScript_1C4C7A:: @ 81C4C7A msgbox Text_1959CC @@ -13789,7 +13787,7 @@ EventScript_1C4C8E:: @ 81C4C8E goto_if eq, EventScript_1C4CE2 setflag FLAG_TUTOR_METRONOME goto EventScript_1C4CEC - end + end EventScript_1C4CE2:: @ 81C4CE2 msgbox Text_19A1CB @@ -13820,7 +13818,7 @@ EventScript_1C4CF6:: @ 81C4CF6 removeitem ITEM_POKE_DOLL, 1 setflag FLAG_TUTOR_MIMIC goto EventScript_1C4D59 - end + end EventScript_1C4D4F:: @ 81C4D4F msgbox Text_19ADD8 @@ -13862,7 +13860,7 @@ FourIsland_House1_EventScript_1C4D84:: @ 81C4D84 goto_if eq, EventScript_1C4DD8 setflag FLAG_TUTOR_BODY_SLAM goto EventScript_1C4DE2 - end + end EventScript_1C4DD8:: @ 81C4DD8 msgbox Text_1A35C7 @@ -14503,7 +14501,7 @@ gText_PlayerSavedTheGame:: @ 81C5647 .string "{PLAYER} saved the game.$" gUnknown_81C565A:: - .string "セーブに しっぱい しました‥$" + .string "セーブに しっぱい しました‥$" gText_DifferentGameFile:: @ 81C566A .string "WARNING!\p" diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index ea213a771..774837274 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_SEA_GALLOP_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 f79ffb046..2d433d4ba 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..a82b30573 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_SEA_GALLOP_VERMILION, FALSE switch VAR_RESULT case 0, EventScript_1A91D5 case 1, EventScript_1A90F6 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..bf1c38578 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_SEA_GALLOP_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 diff --git a/data/strings.s b/data/strings.s index b46766ed3..994e32d0f 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1484,19 +1484,19 @@ gText_Tm30_4500Coins:: @ 0x8417A84 gText_Tm35_4000Coins:: @ 0x8417A9A .string "TM35{CLEAR_TO 0x48}{SMALL}4,000 COINS$" -gText_1F:: @ 0x8417AB0 +gText_1F_2:: @ 0x8417AB0 .string "1F$" -gText_2F:: @ 0x8417AB3 +gText_2F_2:: @ 0x8417AB3 .string "2F$" -gText_3F:: @ 0x8417AB6 +gText_3F_2:: @ 0x8417AB6 .string "3F$" -gText_4F:: @ 0x8417AB9 +gText_4F_2:: @ 0x8417AB9 .string "4F$" -gText_5F:: @ 0x8417ABC +gText_5F_2:: @ 0x8417ABC .string "5F$" gText_Cool:: @ 0x8417ABF @@ -1856,37 +1856,37 @@ gUnknown_8418022:: @ 0x8418022 gUnknown_841802F:: @ 0x841802F .string "EARTHBADGE$" -gUnknown_841803A:: @ 0x841803A +gText_1F:: @ 0x841803A .string "1F$" -gUnknown_841803D:: @ 0x841803D +gText_2F:: @ 0x841803D .string "2F$" -gUnknown_8418040:: @ 0x8418040 +gText_3F:: @ 0x8418040 .string "3F$" -gUnknown_8418043:: @ 0x8418043 +gText_4F:: @ 0x8418043 .string "4F$" -gUnknown_8418046:: @ 0x8418046 +gText_5F:: @ 0x8418046 .string "5F$" -gUnknown_8418049:: @ 0x8418049 +gText_6F:: @ 0x8418049 .string "6F$" -gUnknown_841804C:: @ 0x841804C +gText_7F:: @ 0x841804C .string "7F$" -gUnknown_841804F:: @ 0x841804F +gText_8F:: @ 0x841804F .string "8F$" -gUnknown_8418052:: @ 0x8418052 +gText_9F:: @ 0x8418052 .string "9F$" -gUnknown_8418055:: @ 0x8418055 +gText_10F:: @ 0x8418055 .string "10F$" -gUnknown_8418059:: @ 0x8418059 +gText_11F:: @ 0x8418059 .string "11F$" gText_B1F:: @ 0x841805D @@ -1895,7 +1895,7 @@ gText_B1F:: @ 0x841805D gText_B2F:: @ 0x8418061 .string "B2F$" -gUnknown_8418065:: @ 0x8418065 +gText_B3F:: @ 0x8418065 .string "B3F$" gText_B4F:: @ 0x8418069 diff --git a/include/constants/menu.h b/include/constants/menu.h index b981cca9e..b873bc296 100644 --- a/include/constants/menu.h +++ b/include/constants/menu.h @@ -4,4 +4,70 @@ #define SCR_MENU_CANCEL 127 #define SCR_MENU_UNSET 255 +#define MULTICHOICE_YES_NO 0 +#define MULTICHOICE_EEVEELUTIONS 1 +#define MULTICHOICE_TRAINER_CARD_ICON_TINT 2 +#define MULTICHOICE_HOF_QUIT 3 +#define MULTICHOICE_EGGS_QUIT 4 +#define MULTICHOICE_VICTORIES_QUIT 5 +#define MULTICHOICE_HOF_EGGS_QUIT 6 +#define MULTICHOICE_HOF_VICTORIES_QUIT 7 +#define MULTICHOICE_EGGS_VICTORIES_QUIT 8 +#define MULTICHOICE_HOF_EGGS_VICTORIES_QUIT 9 +#define MULTICHOICE_EXIT 10 +#define MULTICHOICE_EXIT_2 11 +#define MULTICHOICE_EXIT_3 12 +#define MULTICHOICE_BIKE_SHOP 13 +#define MULTICHOICE_GAME_CORNER_POKEMON_PRIZES 14 +#define MULTICHOICE_TRAINER_SCHOOL_WHITEBOARD 15 +#define MULTICHOICE_YES_NO_INFO 16 +#define MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT 17 +#define MULTICHOICE_YES_NO_INFO_2 18 +#define MULTICHOICE_CHALLENGE_INFO_EXIT 19 +#define MULTICHOICE_ROOFTOP_B1F 20 +#define MULTICHOICE_HELIX 21 +#define MULTICHOICE_DOME 22 +#define MULTICHOICE_AMBER 23 +#define MULTICHOICE_HELIX_AMBER 24 +#define MULTICHOICE_DOME_AMBER 25 +#define MULTICHOICE_CELADON_VENDING_MACHINE 26 +#define MULTICHOICE_GAME_CORNER_COIN_PURCHASE_COUNTER 27 +#define MULTICHOICE_EXCELLENT_NOT_SO_BAD 28 +#define MULTICHOICE_RIGHT_LEFT 29 +#define MULTICHOICE_GAME_CORNER_TMPRIZES 30 +#define MULTICHOICE_DEPT_STORE_ELEVATOR 31 +#define MULTICHOICE_THIRSTY_GIRL_FRESH_WATER 32 +#define MULTICHOICE_THIRSTY_GIRL_SODA_POP 33 +#define MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP 34 +#define MULTICHOICE_THIRSTY_GIRL_LEMONADE 35 +#define MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_LEMONADE 36 +#define MULTICHOICE_THIRSTY_GIRL_SODA_POP_LEMONADE 37 +#define MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP_LEMONADE 38 +#define MULTICHOICE_TRADE_CENTER_COLOSSEUM 39 +#define MULTICHOICE_LINK_WIRELESS 40 +#define MULTICHOICE_GAME_CORNER_BATTLE_ITEM_PRIZES 41 +#define MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR 42 +#define MULTICHOICE_LINKED_DIRECT_UNION 43 +#define MULTICHOICE_ISLAND_23 44 +#define MULTICHOICE_ISLAND_13 45 +#define MULTICHOICE_ISLAND_12 46 +#define MULTICHOICE_TRADE_COLOSSEUM_CRUSH 47 +#define MULTICHOICE_48 48 +#define MULTICHOICE_POKEJUMP_DODRIO 49 +#define MULTICHOICE_TRADE_COLOSSEUM_2 50 +#define MULTICHOICE_MUSHROOMS 51 +#define MULTICHOICE_TRADE_COLOSSEUM_BLANK_CRUSH 52 +#define MULTICHOICE_TRADE_COLOSSEUM_BLANK 53 +#define MULTICHOICE_SEVII_NAVEL 54 +#define MULTICHOICE_SEVII_BIRTH 55 +#define MULTICHOICE_SEVII_NAVEL_BIRTH 56 +#define MULTICHOICE_SEA_GALLOP_123 57 +#define MULTICHOICE_SEA_GALLOP_V23 58 +#define MULTICHOICE_SEA_GALLOP_V13 59 +#define MULTICHOICE_SEA_GALLOP_V12 60 +#define MULTICHOICE_SEA_GALLOP_VERMILION 61 +#define MULTICHOICE_62 62 +#define MULTICHOICE_JOIN_OR_LEAD 63 +#define MULTICHOICE_TRAINER_TOWER_MODE 64 + #endif //GUARD_CONSTANTS_MENU_H diff --git a/include/strings.h b/include/strings.h index 7613225d4..d60e841ef 100644 --- a/include/strings.h +++ b/include/strings.h @@ -475,20 +475,20 @@ extern const u8 gUnknown_8417FD0[]; extern const u8 gUnknown_8417FCC[]; extern const u8 gUnknown_8418075[]; extern const u8 gText_B4F[]; -extern const u8 gUnknown_8418065[]; +extern const u8 gText_B3F[]; extern const u8 gText_B2F[]; extern const u8 gText_B1F[]; -extern const u8 gUnknown_841803A[]; -extern const u8 gUnknown_841803D[]; -extern const u8 gUnknown_8418040[]; -extern const u8 gUnknown_8418043[]; -extern const u8 gUnknown_8418046[]; -extern const u8 gUnknown_8418049[]; -extern const u8 gUnknown_841804C[]; -extern const u8 gUnknown_841804F[]; -extern const u8 gUnknown_8418052[]; -extern const u8 gUnknown_8418055[]; -extern const u8 gUnknown_8418059[]; +extern const u8 gText_1F[]; +extern const u8 gText_2F[]; +extern const u8 gText_3F[]; +extern const u8 gText_4F[]; +extern const u8 gText_5F[]; +extern const u8 gText_6F[]; +extern const u8 gText_7F[]; +extern const u8 gText_8F[]; +extern const u8 gText_9F[]; +extern const u8 gText_10F[]; +extern const u8 gText_11F[]; extern const u8 gText_Rooftop[]; extern const u8 gUnknown_8417FD9[]; extern const u8 gUnknown_8417FE6[]; @@ -562,11 +562,11 @@ extern const u8 gText_Tm23_3500Coins[]; extern const u8 gText_Tm24_4000Coins[]; extern const u8 gText_Tm30_4500Coins[]; extern const u8 gText_Tm35_4000Coins[]; -extern const u8 gText_1F[]; -extern const u8 gText_2F[]; -extern const u8 gText_3F[]; -extern const u8 gText_4F[]; -extern const u8 gText_5F[]; +extern const u8 gText_1F_2[]; +extern const u8 gText_2F_2[]; +extern const u8 gText_3F_2[]; +extern const u8 gText_4F_2[]; +extern const u8 gText_5F_2[]; extern const u8 gText_Normal[]; extern const u8 gText_Black[]; extern const u8 gText_Pink[]; diff --git a/src/field_specials.c b/src/field_specials.c index 354226d09..177df7580 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -730,20 +730,20 @@ static const struct WindowTemplate sElevatorCurrentFloorWindowTemplate = { static const u8 *const sFloorNamePointers[] = { gText_B4F, - gUnknown_8418065, + gText_B3F, gText_B2F, gText_B1F, - gUnknown_841803A, - gUnknown_841803D, - gUnknown_8418040, - gUnknown_8418043, - gUnknown_8418046, - gUnknown_8418049, - gUnknown_841804C, - gUnknown_841804F, - gUnknown_8418052, - gUnknown_8418055, - gUnknown_8418059, + gText_1F, + gText_2F, + gText_3F, + gText_4F, + gText_5F, + gText_6F, + gText_7F, + gText_8F, + gText_9F, + gText_10F, + gText_11F, gText_Rooftop }; @@ -1237,17 +1237,17 @@ static const u8 *const sListMenuLabels[][12] = { gUnknown_841802F, gOtherText_Exit, }, { - gUnknown_8418059, - gUnknown_8418055, - gUnknown_8418052, - gUnknown_841804F, - gUnknown_841804C, - gUnknown_8418049, - gUnknown_8418046, - gUnknown_8418043, - gUnknown_8418040, - gUnknown_841803D, - gUnknown_841803A, + gText_11F, + gText_10F, + gText_9F, + gText_8F, + gText_7F, + gText_6F, + gText_5F, + gText_4F, + gText_3F, + gText_2F, + gText_1F, gOtherText_Exit, }, { gText_B1F, @@ -1255,11 +1255,11 @@ static const u8 *const sListMenuLabels[][12] = { gText_B4F, gOtherText_Exit, }, { - gUnknown_8418046, - gUnknown_8418043, - gUnknown_8418040, - gUnknown_841803D, - gUnknown_841803A, + gText_5F, + gText_4F, + gText_3F, + gText_2F, + gText_1F, gOtherText_Exit, }, { gText_LinkedGamePlay, diff --git a/src/script_menu.c b/src/script_menu.c index 1076e19c0..08baed433 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -40,59 +40,59 @@ static void DestroyScriptMenuWindow(u8 windowId); static u8 CreateWindowFromRect(u8 left, u8 top, u8 width, u8 height); -static const struct MenuAction sScriptMultiChoiceMenu_0[] = { +static const struct MenuAction sScriptMultiChoiceMenu_YesNo[] = { { gText_Yes }, { gText_No } }; -static const struct MenuAction sScriptMultiChoiceMenu_2[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TrainerCardIconTint[] = { { gText_Normal }, { gText_Black }, { gText_Pink }, { gText_Sepia } }; -static const struct MenuAction sScriptMultiChoiceMenu_3[] = { +static const struct MenuAction sScriptMultiChoiceMenu_HOF_Quit[] = { { gText_HallOfFame }, { gText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_4[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Eggs_Quit[] = { { gText_Eggs }, { gText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_5[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Victories_Quit[] = { { gText_Victories }, { gText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_6[] = { +static const struct MenuAction sScriptMultiChoiceMenu_HOF_Eggs_Quit[] = { { gText_HallOfFame }, { gText_Eggs }, { gText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_7[] = { +static const struct MenuAction sScriptMultiChoiceMenu_HOF_Victories_Quit[] = { { gText_HallOfFame }, { gText_Victories }, { gText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_8[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Eggs_Victories_Quit[] = { { gText_Eggs }, { gText_Victories }, { gText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_9[] = { +static const struct MenuAction sScriptMultiChoiceMenu_HOF_Eggs_Victories_Quit[] = { { gText_HallOfFame }, { gText_Eggs }, { gText_Victories }, { gText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_15[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TrainerSchoolWhiteboard[] = { { gText_Slp }, { gText_Psn }, { gText_Par }, @@ -101,13 +101,13 @@ static const struct MenuAction sScriptMultiChoiceMenu_15[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_16[] = { +static const struct MenuAction sScriptMultiChoiceMenu_YesNoInfo[] = { { gText_Yes }, { gText_No }, { gText_Info } }; -static const struct MenuAction sScriptMultiChoiceMenu_17[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SingleDoubleMultiInfoExit[] = { { gText_SingleBattle }, { gText_DoubleBattle }, { gText_MultiBattle }, @@ -115,59 +115,59 @@ static const struct MenuAction sScriptMultiChoiceMenu_17[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_18[] = { +static const struct MenuAction sScriptMultiChoiceMenu_YesNoInfo2[] = { { gText_Yes }, { gText_No }, { gText_Info } }; -static const struct MenuAction sScriptMultiChoiceMenu_19[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ChallengeInfoExit[] = { { gText_MakeAChallenge }, { gText_Info_2 }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_20[] = { +static const struct MenuAction sScriptMultiChoiceMenu_RooftopB1F[] = { { gText_Rooftop }, { gText_B1F }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_21[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Helix[] = { { gText_HelixFossil }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_22[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Dome[] = { { gText_DomeFossil }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_23[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Amber[] = { { gText_OldAmber }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_24[] = { +static const struct MenuAction sScriptMultiChoiceMenu_HelixAmber[] = { { gText_HelixFossil }, { gText_OldAmber }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_25[] = { +static const struct MenuAction sScriptMultiChoiceMenu_DomeAmber[] = { { gText_DomeFossil }, { gText_OldAmber }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_26[] = { +static const struct MenuAction sScriptMultiChoiceMenu_CeladonVendingMachine[] = { { gText_FreshWater_200 }, { gText_SodaPop_300 }, { gText_Lemonade_350 }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_30[] = { +static const struct MenuAction sScriptMultiChoiceMenu_GameCornerTMPrizes[] = { { gText_Tm13_4000Coins }, { gText_Tm23_3500Coins }, { gText_Tm24_4000Coins }, @@ -176,7 +176,7 @@ static const struct MenuAction sScriptMultiChoiceMenu_30[] = { { gText_NoThanks_2 } }; -static const struct MenuAction sScriptMultiChoiceMenu_41[] = { +static const struct MenuAction sScriptMultiChoiceMenu_GameCornerBattleItemPrizes[] = { { gText_SmokeBall_800Coins }, { gText_MiracleSeed_1000Coins }, { gText_Charcoal_1000Coins }, @@ -185,65 +185,65 @@ static const struct MenuAction sScriptMultiChoiceMenu_41[] = { { gText_NoThanks_2 } }; -static const struct MenuAction sScriptMultiChoiceMenu_27[] = { +static const struct MenuAction sScriptMultiChoiceMenu_GameCornerCoinPurchaseCounter[] = { { gText_50Coins_1000 }, { gText_500Coins_10000 }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_28[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Excellent_NotSoBad[] = { { gText_Excellent }, { gText_NotSoBad } }; -static const struct MenuAction sScriptMultiChoiceMenu_29[] = { +static const struct MenuAction sScriptMultiChoiceMenu_RightLeft[] = { { gText_Right }, { gText_Left } }; -static const struct MenuAction sScriptMultiChoiceMenu_31[] = { - { gText_5F }, - { gText_4F }, - { gText_3F }, - { gText_2F }, - { gText_1F }, +static const struct MenuAction sScriptMultiChoiceMenu_DeptStoreElevator[] = { + { gText_5F_2 }, + { gText_4F_2 }, + { gText_3F_2 }, + { gText_2F_2 }, + { gText_1F_2 }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_32[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ThirstyGirlFreshWater[] = { { gText_FreshWater }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_33[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ThirstyGirlSodaPop[] = { { gText_SodaPop }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_34[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ThirstyGirlFreshWaterSodaPop[] = { { gText_FreshWater }, { gText_SodaPop }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_35[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ThirstyGirlLemonade[] = { { gText_Lemonade }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_36[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ThirstyGirlFreshWaterLemonade[] = { { gText_FreshWater }, { gText_Lemonade }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_37[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ThirstyGirlSodaPopLemonade[] = { { gText_SodaPop }, { gText_Lemonade }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_38[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ThirstyGirlFreshWaterSodaPopLemonade[] = { { gText_FreshWater }, { gText_SodaPop }, { gText_Lemonade }, @@ -302,7 +302,7 @@ static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_7[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_1[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Eeveelutions[] = { { gText_Eevee }, { gText_Flareon }, { gText_Jolteon }, @@ -310,12 +310,12 @@ static const struct MenuAction sScriptMultiChoiceMenu_1[] = { { gText_QuitLooking } }; -static const struct MenuAction sScriptMultiChoiceMenu_13[] = { +static const struct MenuAction sScriptMultiChoiceMenu_BikeShop[] = { { gText_Bicycle_1000000 }, { gText_NoThanks } }; -static const struct MenuAction sScriptMultiChoiceMenu_14[] = { +static const struct MenuAction sScriptMultiChoiceMenu_GameCornerPokemonPrizes[] = { { gText_Abra_180Coins }, { gText_Clefairy_500Coins }, { gText_Dratini_2800Coins }, @@ -324,51 +324,51 @@ static const struct MenuAction sScriptMultiChoiceMenu_14[] = { { gText_NoThanks_2 } }; -static const struct MenuAction sScriptMultiChoiceMenu_39[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TradeCenter_Colosseum[] = { { gText_TradeCenter }, { gText_Colosseum }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_40[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Link_Wireless[] = { { gText_GameLinkCable }, { gText_Wireless }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_42[] = { +static const struct MenuAction sScriptMultiChoiceMenu_RocketHideoutElevator[] = { { gText_B1F }, { gText_B2F }, { gText_B4F }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_43[] = { +static const struct MenuAction sScriptMultiChoiceMenu_LinkedDirectUnion[] = { { gText_LinkedGamePlay }, { gText_DirectCorner }, { gText_UnionRoom }, { gOtherText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_44[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Island23[] = { { gText_TwoIsland }, { gText_ThreeIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_45[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Island13[] = { { gText_OneIsland }, { gText_ThreeIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_46[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Island12[] = { { gText_OneIsland }, { gText_TwoIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_47[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TradeColosseumCrush[] = { { gText_TradeCenter }, { gText_Colosseum_2 }, { gText_BerryCrush }, @@ -381,24 +381,24 @@ static const struct MenuAction sScriptMultiChoiceMenu_48[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_50[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TradeColosseum_2[] = { { gText_TradeCenter }, { gText_Colosseum_2 }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_49[] = { +static const struct MenuAction sScriptMultiChoiceMenu_PokejumpDodrio[] = { { gText_PokemonJump }, { gText_DodrioBerryPicking }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_51[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Mushrooms[] = { { gText_2Tinymushrooms }, { gText_1BigMushroom } }; -static const struct MenuAction sScriptMultiChoiceMenu_52[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TradeColosseumBlankCrush[] = { { gText_TradeCenter }, { gText_Colosseum_2 }, { gText_Dummy_8417E71 }, @@ -406,61 +406,61 @@ static const struct MenuAction sScriptMultiChoiceMenu_52[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_53[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TradeColosseumBlank[] = { { gText_TradeCenter }, { gText_Colosseum_2 }, { gText_Dummy_8417E71 }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_54[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeviiNavel[] = { { gText_SeviiIslands }, { gText_NavelRock }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_55[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeviiBirth[] = { { gText_SeviiIslands }, { gText_BirthIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_56[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeviiNavelBirth[] = { { gText_SeviiIslands }, { gText_NavelRock }, { gText_BirthIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_57[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeaGallop123[] = { { gText_OneIsland }, { gText_TwoIsland }, { gText_ThreeIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_58[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopV23[] = { { gText_Vermilion }, { gText_TwoIsland }, { gText_ThreeIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_59[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopV13[] = { { gText_Vermilion }, { gText_OneIsland }, { gText_ThreeIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_60[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopV12[] = { { gText_Vermilion }, { gText_OneIsland }, { gText_TwoIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_61[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopVermilion[] = { { gText_Vermilion }, { gOtherText_Exit } }; @@ -471,13 +471,13 @@ static const struct MenuAction sScriptMultiChoiceMenu_62[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_63[] = { +static const struct MenuAction sScriptMultiChoiceMenu_JoinOrLead[] = { { gText_JoinGroup }, { gText_BecomeLeader }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_64[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TrainerTowerMode[] = { { gOtherText_Single }, { gOtherText_Double }, { gOtherText_Knockout }, @@ -485,76 +485,76 @@ static const struct MenuAction sScriptMultiChoiceMenu_64[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_10[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Exit[] = { { gOtherText_Exit } }; const struct MultichoiceListStruct gScriptMultiChoiceMenus[] = { - { sScriptMultiChoiceMenu_0, NELEMS(sScriptMultiChoiceMenu_0) }, - { sScriptMultiChoiceMenu_1, NELEMS(sScriptMultiChoiceMenu_1) }, - { sScriptMultiChoiceMenu_2, NELEMS(sScriptMultiChoiceMenu_2) }, - { sScriptMultiChoiceMenu_3, NELEMS(sScriptMultiChoiceMenu_3) }, - { sScriptMultiChoiceMenu_4, NELEMS(sScriptMultiChoiceMenu_4) }, - { sScriptMultiChoiceMenu_5, NELEMS(sScriptMultiChoiceMenu_5) }, - { sScriptMultiChoiceMenu_6, NELEMS(sScriptMultiChoiceMenu_6) }, - { sScriptMultiChoiceMenu_7, NELEMS(sScriptMultiChoiceMenu_7) }, - { sScriptMultiChoiceMenu_8, NELEMS(sScriptMultiChoiceMenu_8) }, - { sScriptMultiChoiceMenu_9, NELEMS(sScriptMultiChoiceMenu_9) }, - { sScriptMultiChoiceMenu_10, NELEMS(sScriptMultiChoiceMenu_10) }, - { sScriptMultiChoiceMenu_10, NELEMS(sScriptMultiChoiceMenu_10) }, - { sScriptMultiChoiceMenu_10, NELEMS(sScriptMultiChoiceMenu_10) }, - { sScriptMultiChoiceMenu_13, NELEMS(sScriptMultiChoiceMenu_13) }, - { sScriptMultiChoiceMenu_14, NELEMS(sScriptMultiChoiceMenu_14) }, - { sScriptMultiChoiceMenu_15, NELEMS(sScriptMultiChoiceMenu_15) }, - { sScriptMultiChoiceMenu_16, NELEMS(sScriptMultiChoiceMenu_16) }, - { sScriptMultiChoiceMenu_17, NELEMS(sScriptMultiChoiceMenu_17) }, - { sScriptMultiChoiceMenu_18, NELEMS(sScriptMultiChoiceMenu_18) }, - { sScriptMultiChoiceMenu_19, NELEMS(sScriptMultiChoiceMenu_19) }, - { sScriptMultiChoiceMenu_20, NELEMS(sScriptMultiChoiceMenu_20) }, - { sScriptMultiChoiceMenu_21, NELEMS(sScriptMultiChoiceMenu_21) }, - { sScriptMultiChoiceMenu_22, NELEMS(sScriptMultiChoiceMenu_22) }, - { sScriptMultiChoiceMenu_23, NELEMS(sScriptMultiChoiceMenu_23) }, - { sScriptMultiChoiceMenu_24, NELEMS(sScriptMultiChoiceMenu_24) }, - { sScriptMultiChoiceMenu_25, NELEMS(sScriptMultiChoiceMenu_25) }, - { sScriptMultiChoiceMenu_26, NELEMS(sScriptMultiChoiceMenu_26) }, - { sScriptMultiChoiceMenu_27, NELEMS(sScriptMultiChoiceMenu_27) }, - { sScriptMultiChoiceMenu_28, NELEMS(sScriptMultiChoiceMenu_28) }, - { sScriptMultiChoiceMenu_29, NELEMS(sScriptMultiChoiceMenu_29) }, - { sScriptMultiChoiceMenu_30, NELEMS(sScriptMultiChoiceMenu_30) }, - { sScriptMultiChoiceMenu_31, NELEMS(sScriptMultiChoiceMenu_31) }, - { sScriptMultiChoiceMenu_32, NELEMS(sScriptMultiChoiceMenu_32) }, - { sScriptMultiChoiceMenu_33, NELEMS(sScriptMultiChoiceMenu_33) }, - { sScriptMultiChoiceMenu_34, NELEMS(sScriptMultiChoiceMenu_34) }, - { sScriptMultiChoiceMenu_35, NELEMS(sScriptMultiChoiceMenu_35) }, - { sScriptMultiChoiceMenu_36, NELEMS(sScriptMultiChoiceMenu_36) }, - { sScriptMultiChoiceMenu_37, NELEMS(sScriptMultiChoiceMenu_37) }, - { sScriptMultiChoiceMenu_38, NELEMS(sScriptMultiChoiceMenu_38) }, - { sScriptMultiChoiceMenu_39, NELEMS(sScriptMultiChoiceMenu_39) }, - { sScriptMultiChoiceMenu_40, NELEMS(sScriptMultiChoiceMenu_40) }, - { sScriptMultiChoiceMenu_41, NELEMS(sScriptMultiChoiceMenu_41) }, - { sScriptMultiChoiceMenu_42, NELEMS(sScriptMultiChoiceMenu_42) }, - { sScriptMultiChoiceMenu_43, NELEMS(sScriptMultiChoiceMenu_43) }, - { sScriptMultiChoiceMenu_44, NELEMS(sScriptMultiChoiceMenu_44) }, - { sScriptMultiChoiceMenu_45, NELEMS(sScriptMultiChoiceMenu_45) }, - { sScriptMultiChoiceMenu_46, NELEMS(sScriptMultiChoiceMenu_46) }, - { sScriptMultiChoiceMenu_47, NELEMS(sScriptMultiChoiceMenu_47) }, + { sScriptMultiChoiceMenu_YesNo, NELEMS(sScriptMultiChoiceMenu_YesNo) }, + { sScriptMultiChoiceMenu_Eeveelutions, NELEMS(sScriptMultiChoiceMenu_Eeveelutions) }, + { sScriptMultiChoiceMenu_TrainerCardIconTint, NELEMS(sScriptMultiChoiceMenu_TrainerCardIconTint) }, + { sScriptMultiChoiceMenu_HOF_Quit, NELEMS(sScriptMultiChoiceMenu_HOF_Quit) }, + { sScriptMultiChoiceMenu_Eggs_Quit, NELEMS(sScriptMultiChoiceMenu_Eggs_Quit) }, + { sScriptMultiChoiceMenu_Victories_Quit, NELEMS(sScriptMultiChoiceMenu_Victories_Quit) }, + { sScriptMultiChoiceMenu_HOF_Eggs_Quit, NELEMS(sScriptMultiChoiceMenu_HOF_Eggs_Quit) }, + { sScriptMultiChoiceMenu_HOF_Victories_Quit, NELEMS(sScriptMultiChoiceMenu_HOF_Victories_Quit) }, + { sScriptMultiChoiceMenu_Eggs_Victories_Quit, NELEMS(sScriptMultiChoiceMenu_Eggs_Victories_Quit) }, + { sScriptMultiChoiceMenu_HOF_Eggs_Victories_Quit, NELEMS(sScriptMultiChoiceMenu_HOF_Eggs_Victories_Quit) }, + { sScriptMultiChoiceMenu_Exit, NELEMS(sScriptMultiChoiceMenu_Exit) }, + { sScriptMultiChoiceMenu_Exit, NELEMS(sScriptMultiChoiceMenu_Exit) }, + { sScriptMultiChoiceMenu_Exit, NELEMS(sScriptMultiChoiceMenu_Exit) }, + { sScriptMultiChoiceMenu_BikeShop, NELEMS(sScriptMultiChoiceMenu_BikeShop) }, + { sScriptMultiChoiceMenu_GameCornerPokemonPrizes, NELEMS(sScriptMultiChoiceMenu_GameCornerPokemonPrizes) }, + { sScriptMultiChoiceMenu_TrainerSchoolWhiteboard, NELEMS(sScriptMultiChoiceMenu_TrainerSchoolWhiteboard) }, + { sScriptMultiChoiceMenu_YesNoInfo, NELEMS(sScriptMultiChoiceMenu_YesNoInfo) }, + { sScriptMultiChoiceMenu_SingleDoubleMultiInfoExit, NELEMS(sScriptMultiChoiceMenu_SingleDoubleMultiInfoExit) }, + { sScriptMultiChoiceMenu_YesNoInfo2, NELEMS(sScriptMultiChoiceMenu_YesNoInfo2) }, + { sScriptMultiChoiceMenu_ChallengeInfoExit, NELEMS(sScriptMultiChoiceMenu_ChallengeInfoExit) }, + { sScriptMultiChoiceMenu_RooftopB1F, NELEMS(sScriptMultiChoiceMenu_RooftopB1F) }, + { sScriptMultiChoiceMenu_Helix, NELEMS(sScriptMultiChoiceMenu_Helix) }, + { sScriptMultiChoiceMenu_Dome, NELEMS(sScriptMultiChoiceMenu_Dome) }, + { sScriptMultiChoiceMenu_Amber, NELEMS(sScriptMultiChoiceMenu_Amber) }, + { sScriptMultiChoiceMenu_HelixAmber, NELEMS(sScriptMultiChoiceMenu_HelixAmber) }, + { sScriptMultiChoiceMenu_DomeAmber, NELEMS(sScriptMultiChoiceMenu_DomeAmber) }, + { sScriptMultiChoiceMenu_CeladonVendingMachine, NELEMS(sScriptMultiChoiceMenu_CeladonVendingMachine) }, + { sScriptMultiChoiceMenu_GameCornerCoinPurchaseCounter, NELEMS(sScriptMultiChoiceMenu_GameCornerCoinPurchaseCounter) }, + { sScriptMultiChoiceMenu_Excellent_NotSoBad, NELEMS(sScriptMultiChoiceMenu_Excellent_NotSoBad) }, + { sScriptMultiChoiceMenu_RightLeft, NELEMS(sScriptMultiChoiceMenu_RightLeft) }, + { sScriptMultiChoiceMenu_GameCornerTMPrizes, NELEMS(sScriptMultiChoiceMenu_GameCornerTMPrizes) }, + { sScriptMultiChoiceMenu_DeptStoreElevator, NELEMS(sScriptMultiChoiceMenu_DeptStoreElevator) }, + { sScriptMultiChoiceMenu_ThirstyGirlFreshWater, NELEMS(sScriptMultiChoiceMenu_ThirstyGirlFreshWater) }, + { sScriptMultiChoiceMenu_ThirstyGirlSodaPop, NELEMS(sScriptMultiChoiceMenu_ThirstyGirlSodaPop) }, + { sScriptMultiChoiceMenu_ThirstyGirlFreshWaterSodaPop, NELEMS(sScriptMultiChoiceMenu_ThirstyGirlFreshWaterSodaPop) }, + { sScriptMultiChoiceMenu_ThirstyGirlLemonade, NELEMS(sScriptMultiChoiceMenu_ThirstyGirlLemonade) }, + { sScriptMultiChoiceMenu_ThirstyGirlFreshWaterLemonade, NELEMS(sScriptMultiChoiceMenu_ThirstyGirlFreshWaterLemonade) }, + { sScriptMultiChoiceMenu_ThirstyGirlSodaPopLemonade, NELEMS(sScriptMultiChoiceMenu_ThirstyGirlSodaPopLemonade) }, + { sScriptMultiChoiceMenu_ThirstyGirlFreshWaterSodaPopLemonade, NELEMS(sScriptMultiChoiceMenu_ThirstyGirlFreshWaterSodaPopLemonade) }, + { sScriptMultiChoiceMenu_TradeCenter_Colosseum, NELEMS(sScriptMultiChoiceMenu_TradeCenter_Colosseum) }, + { sScriptMultiChoiceMenu_Link_Wireless, NELEMS(sScriptMultiChoiceMenu_Link_Wireless) }, + { sScriptMultiChoiceMenu_GameCornerBattleItemPrizes, NELEMS(sScriptMultiChoiceMenu_GameCornerBattleItemPrizes) }, + { sScriptMultiChoiceMenu_RocketHideoutElevator, NELEMS(sScriptMultiChoiceMenu_RocketHideoutElevator) }, + { sScriptMultiChoiceMenu_LinkedDirectUnion, NELEMS(sScriptMultiChoiceMenu_LinkedDirectUnion) }, + { sScriptMultiChoiceMenu_Island23, NELEMS(sScriptMultiChoiceMenu_Island23) }, + { sScriptMultiChoiceMenu_Island13, NELEMS(sScriptMultiChoiceMenu_Island13) }, + { sScriptMultiChoiceMenu_Island12, NELEMS(sScriptMultiChoiceMenu_Island12) }, + { sScriptMultiChoiceMenu_TradeColosseumCrush, NELEMS(sScriptMultiChoiceMenu_TradeColosseumCrush) }, { sScriptMultiChoiceMenu_48, NELEMS(sScriptMultiChoiceMenu_48) }, - { sScriptMultiChoiceMenu_49, NELEMS(sScriptMultiChoiceMenu_49) }, - { sScriptMultiChoiceMenu_50, NELEMS(sScriptMultiChoiceMenu_50) }, - { sScriptMultiChoiceMenu_51, NELEMS(sScriptMultiChoiceMenu_51) }, - { sScriptMultiChoiceMenu_52, NELEMS(sScriptMultiChoiceMenu_52) }, - { sScriptMultiChoiceMenu_53, NELEMS(sScriptMultiChoiceMenu_53) }, - { sScriptMultiChoiceMenu_54, NELEMS(sScriptMultiChoiceMenu_54) }, - { sScriptMultiChoiceMenu_55, NELEMS(sScriptMultiChoiceMenu_55) }, - { sScriptMultiChoiceMenu_56, NELEMS(sScriptMultiChoiceMenu_56) }, - { sScriptMultiChoiceMenu_57, NELEMS(sScriptMultiChoiceMenu_57) }, - { sScriptMultiChoiceMenu_58, NELEMS(sScriptMultiChoiceMenu_58) }, - { sScriptMultiChoiceMenu_59, NELEMS(sScriptMultiChoiceMenu_59) }, - { sScriptMultiChoiceMenu_60, NELEMS(sScriptMultiChoiceMenu_60) }, - { sScriptMultiChoiceMenu_61, NELEMS(sScriptMultiChoiceMenu_61) }, + { sScriptMultiChoiceMenu_PokejumpDodrio, NELEMS(sScriptMultiChoiceMenu_PokejumpDodrio) }, + { sScriptMultiChoiceMenu_TradeColosseum_2, NELEMS(sScriptMultiChoiceMenu_TradeColosseum_2) }, + { sScriptMultiChoiceMenu_Mushrooms, NELEMS(sScriptMultiChoiceMenu_Mushrooms) }, + { sScriptMultiChoiceMenu_TradeColosseumBlankCrush, NELEMS(sScriptMultiChoiceMenu_TradeColosseumBlankCrush) }, + { sScriptMultiChoiceMenu_TradeColosseumBlank, NELEMS(sScriptMultiChoiceMenu_TradeColosseumBlank) }, + { sScriptMultiChoiceMenu_SeviiNavel, NELEMS(sScriptMultiChoiceMenu_SeviiNavel) }, + { sScriptMultiChoiceMenu_SeviiBirth, NELEMS(sScriptMultiChoiceMenu_SeviiBirth) }, + { sScriptMultiChoiceMenu_SeviiNavelBirth, NELEMS(sScriptMultiChoiceMenu_SeviiNavelBirth) }, + { sScriptMultiChoiceMenu_SeaGallop123, NELEMS(sScriptMultiChoiceMenu_SeaGallop123) }, + { sScriptMultiChoiceMenu_SeaGallopV23, NELEMS(sScriptMultiChoiceMenu_SeaGallopV23) }, + { sScriptMultiChoiceMenu_SeaGallopV13, NELEMS(sScriptMultiChoiceMenu_SeaGallopV13) }, + { sScriptMultiChoiceMenu_SeaGallopV12, NELEMS(sScriptMultiChoiceMenu_SeaGallopV12) }, + { sScriptMultiChoiceMenu_SeaGallopVermilion, NELEMS(sScriptMultiChoiceMenu_SeaGallopVermilion) }, { sScriptMultiChoiceMenu_62, NELEMS(sScriptMultiChoiceMenu_62) }, - { sScriptMultiChoiceMenu_63, NELEMS(sScriptMultiChoiceMenu_63) }, - { sScriptMultiChoiceMenu_64, NELEMS(sScriptMultiChoiceMenu_64) } + { sScriptMultiChoiceMenu_JoinOrLead, NELEMS(sScriptMultiChoiceMenu_JoinOrLead) }, + { sScriptMultiChoiceMenu_TrainerTowerMode, NELEMS(sScriptMultiChoiceMenu_TrainerTowerMode) } }; const u8 *const gStdStringPtrs[] = { |