diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/script_menu.h | 114 | ||||
| -rw-r--r-- | include/strings.h | 2 |
2 files changed, 58 insertions, 58 deletions
diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h index 9fa5ca1d9..a3a48e588 100644 --- a/include/constants/script_menu.h +++ b/include/constants/script_menu.h @@ -3,34 +3,34 @@ #define MULTICHOICE(name) {name, ARRAY_COUNT(name)} -#define MULTICHOICE_B 127 +#define MULTI_B_PRESSED 127 // Multichoice Ids -#define MULTI_0 0 -#define MULTI_EXIT 1 +#define MULTI_BRINEY_ON_DEWFORD 0 +#define MULTI_UNUSED_1 1 #define MULTI_ENTERINFO 2 #define MULTI_CONTEST_INFO 3 #define MULTI_CONTEST_TYPE 4 -#define MULTI_DECOR_NO_REGISTRY 5 +#define MULTI_DECOR_NOREGISTRY 5 #define MULTI_DECOR_REGISTRY 6 -#define MULTI_7 7 // +#define MULTI_REGISTER_MENU 7 #define MULTI_UNUSED_8 8 #define MULTI_UNUSED_9 9 #define MULTI_UNUSED_10 10 -#define MULTI_11 11 // -#define MULTI_BIKE 12 // -#define MULTI_STATUS 13 // -#define MULTI_14 14 // +#define MULTI_FRONTIER_PASS_INFO 11 +#define MULTI_BIKE 12 +#define MULTI_STATUS_INFO 13 +#define MULTI_BRINEY_OFF_DEWFORD 14 #define MULTI_UNUSED_15 15 -#define MULTI_16 16 // +#define MULTI_VIEWED_PAINTINGS 16 #define MULTI_YESNOINFO 17 -#define MULTI_18 18 // +#define MULTI_BATTLE_MODE 18 #define MULTI_UNUSED_19 19 #define MULTI_YESNOINFO_2 20 #define MULTI_UNUSED_21 21 #define MULTI_UNUSED_22 22 -#define MULTI_23 23 // -#define MULTI_24 24 // +#define MULTI_CHALLENGEINFO 23 +#define MULTI_LEVEL_MODE 24 #define MULTI_MECHADOLL1_Q1 25 #define MULTI_MECHADOLL1_Q2 26 #define MULTI_MECHADOLL1_Q3 27 @@ -51,19 +51,19 @@ #define MULTI_VENDING_MACHINE 42 #define MULTI_MACH_BIKE_INFO 43 #define MULTI_ACRO_BIKE_INFO 44 -#define MULTI_45 45 // -#define MULTI_46 46 // -#define MULTI_47 47 //used? +#define MULTI_SATISFACTION 45 +#define MULTI_STERN_DEEPSEA 46 +#define MULTI_UNUSED_ASH_VENDOR 47 // Replaced by scrollable multichoice #define MULTI_GAME_CORNER_DOLLS 48 #define MULTI_GAME_CORNER_COINS 49 -#define MULTI_50 50 // +#define MULTI_HOWS_FISHING 50 #define MULTI_UNUSED_51 51 -#define MULTI_52 52 // -#define MULTI_53 53 // +#define MULTI_SSTIDAL_SLATEPORT_1 52 +#define MULTI_SSTIDAL_BATTLE_FRONTIER 53 #define MULTI_RIGHTLEFT 54 #define MULTI_GAME_CORNER_TMS 55 -#define MULTI_56 56 // -#define MULTI_FLOOR 57 +#define MULTI_SSTIDAL_SLATEPORT_2 56 +#define MULTI_FLOORS 57 #define MULTI_SHARDS_R 58 #define MULTI_SHARDS_Y 59 #define MULTI_SHARDS_RY 60 @@ -79,46 +79,46 @@ #define MULTI_SHARDS_RBG 70 #define MULTI_SHARDS_YBG 71 #define MULTI_SHARDS_RYBG 72 -#define MULTI_73 73 // -#define MULTI_74 74 // -#define MULTI_75 75 // -#define MULTI_76 76 // -#define MULTI_77 77 // -#define MULTI_78 78 // -#define MULTI_79 79 // -#define MULTI_80 80 // -#define MULTI_81 81 // +#define MULTI_TOURNEY_WITH_RECORD 73 +#define MULTI_LINK_SERVICES_A1 74 +#define MULTI_LINK_SERVICES_A2 75 +#define MULTI_LINK_SERVICES_B1 76 +#define MULTI_LINK_SERVICES_B2 77 +#define MULTI_LINK_SERVICES_C 78 +#define MULTI_LINK_SERVICES_D 79 +#define MULTI_WIRELESS_MINIGAME 80 +#define MULTI_LINK_LEADER 81 #define MULTI_CONTEST_RANK 82 -#define MULTI_83 83 // -#define MULTI_84 84 // -#define MULTI_85 85 // -#define MULTI_UNUSED_START_MENU 86 -#define MULTI_87 87 // +#define MULTI_FRONTIER_ITEM_CHOOSE 83 +#define MULTI_LINK_CONTEST_INFO 84 +#define MULTI_LINK_CONTEST_MODE 85 +#define MULTI_FORCED_START_MENU 86 +#define MULTI_FRONTIER_GAMBLER_BET 87 #define MULTI_TENT 88 -#define MULTI_UNUSED_SSTIDAL_1 89 // these 4 replaced by scrollable mulitchoice -#define MULTI_UNUSED_SSTIDAL_2 90 -#define MULTI_UNUSED_SSTIDAL_3 91 -#define MULTI_UNUSED_SSTIDAL_4 92 -#define MULTI_FOSSIL 93 // +#define MULTI_UNUSED_SSTIDAL_1 89 // These 4 replaced by scrollable multichoice +#define MULTI_UNUSED_SSTIDAL_2 90 // +#define MULTI_UNUSED_SSTIDAL_3 91 // +#define MULTI_UNUSED_SSTIDAL_4 92 // +#define MULTI_FOSSIL 93 #define MULTI_YESNO 94 -#define MULTI_95 95 // -#define MULTI_96 96 // -#define MULTI_97 97 // -#define MULTI_98 98 // -#define MULTI_99 99 // -#define MULTI_100 100 // -#define MULTI_101 101 // -#define MULTI_102 102 // -#define MULTI_103 103 // -#define MULTI_104 104 // -#define MULTI_105 105 // -#define MULTI_106 106 // -#define MULTI_107 107 // +#define MULTI_FRONTIER_RULES 95 +#define MULTI_BATTLE_ARENA_RULES 96 +#define MULTI_BATTLE_TOWER_RULES 97 +#define MULTI_BATTLE_DOME_RULES 98 +#define MULTI_BATTLE_FACTORY_RULES 99 +#define MULTI_BATTLE_PALACE_RULES 100 +#define MULTI_BATTLE_PYRAMID_RULES 101 +#define MULTI_BATTLE_PIKE_RULES 102 +#define MULTI_GO_ON_RECORD_REST_RETIRE 103 +#define MULTI_GO_ON_REST_RETIRE 104 +#define MULTI_GO_ON_RECORD_RETIRE 105 +#define MULTI_GO_ON_RETIRE 106 +#define MULTI_TOURNEY_NO_RECORD 107 #define MULTI_TV_LATI 108 -#define MULTI_109 109 // -#define MULTI_110 110 // -#define MULTI_111 111 // -#define MULTI_112 112 // +#define MULTI_BATTLE_TOWER_FEELINGS 109 +#define MULTI_WHERES_RAYQUAZA 110 +#define MULTI_SLATEPORT_TENT_RULES 111 +#define MULTI_FALLARBOR_TENT_RULES 112 #define MULTI_TAG_MATCH_TYPE 113 // Std String Ids diff --git a/include/strings.h b/include/strings.h index e9f1fe2ad..c1414269a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1212,7 +1212,7 @@ extern const u8 gText_AboutG_Mode[]; extern const u8 gText_E_Mode[]; extern const u8 gText_G_Mode[]; extern const u8 gText_Blank[]; -extern const u8 gText_TwoSpaces[]; +extern const u8 gText_5BP[]; extern const u8 gText_10BP[]; extern const u8 gText_15BP[]; extern const u8 gText_ClawFossil[]; |