Document more script_menu, lilycove harbor

3 files changed, 132 insertions, 120 deletions

diff --git a/include/constants/flags.h b/include/constants/flags.h
index d097eeb1b..4679e953c 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -701,7 +701,7 @@
 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN            0x2E9
 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN                0x2EA
 #define FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION                  0x2EB
-#define FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER                  0x2EC
+#define FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER                0x2EC
 #define FLAG_HIDE_SLATEPORT_CITY_SCOTT                              0x2ED
 #define FLAG_HIDE_ROUTE_101_ZIGZAGOON                               0x2EE
 #define FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY                           0x2EF
diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h
index a3a48e588..820ecad6e 100644
--- a/include/constants/script_menu.h
+++ b/include/constants/script_menu.h
@@ -3,123 +3,135 @@
 
 #define MULTICHOICE(name) {name, ARRAY_COUNT(name)}
 
+#define MAX_MULTICHOICE_WIDTH 28
+
 #define MULTI_B_PRESSED  127
 
 // Multichoice Ids
-#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_NOREGISTRY 5
-#define MULTI_DECOR_REGISTRY 6
-#define MULTI_REGISTER_MENU 7
-#define MULTI_UNUSED_8 8
-#define MULTI_UNUSED_9 9
-#define MULTI_UNUSED_10 10
-#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_VIEWED_PAINTINGS 16
-#define MULTI_YESNOINFO 17
-#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_CHALLENGEINFO 23
-#define MULTI_LEVEL_MODE 24
-#define MULTI_MECHADOLL1_Q1 25
-#define MULTI_MECHADOLL1_Q2 26
-#define MULTI_MECHADOLL1_Q3 27
-#define MULTI_MECHADOLL2_Q1 28
-#define MULTI_MECHADOLL2_Q2 29
-#define MULTI_MECHADOLL2_Q3 30
-#define MULTI_MECHADOLL3_Q1 31
-#define MULTI_MECHADOLL3_Q2 32
-#define MULTI_MECHADOLL3_Q3 33
-#define MULTI_MECHADOLL4_Q1 34
-#define MULTI_MECHADOLL4_Q2 35
-#define MULTI_MECHADOLL4_Q3 36
-#define MULTI_MECHADOLL5_Q1 37
-#define MULTI_MECHADOLL5_Q2 38
-#define MULTI_MECHADOLL5_Q3 39
-#define MULTI_UNUSED_40 40
-#define MULTI_UNUSED_41 41
-#define MULTI_VENDING_MACHINE 42
-#define MULTI_MACH_BIKE_INFO 43
-#define MULTI_ACRO_BIKE_INFO 44
-#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_HOWS_FISHING 50
-#define MULTI_UNUSED_51 51
-#define MULTI_SSTIDAL_SLATEPORT_1 52
-#define MULTI_SSTIDAL_BATTLE_FRONTIER 53
-#define MULTI_RIGHTLEFT 54
-#define MULTI_GAME_CORNER_TMS 55
-#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
-#define MULTI_SHARDS_B 61
-#define MULTI_SHARDS_RB 62
-#define MULTI_SHARDS_YB 63
-#define MULTI_SHARDS_RYB 64
-#define MULTI_SHARDS_G 65
-#define MULTI_SHARDS_RG 66
-#define MULTI_SHARDS_YG 67
-#define MULTI_SHARDS_RYG 68
-#define MULTI_SHARDS_BG 69
-#define MULTI_SHARDS_RBG 70
-#define MULTI_SHARDS_YBG 71
-#define MULTI_SHARDS_RYBG 72
-#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_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 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_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_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
+#define MULTI_BRINEY_ON_DEWFORD         0
+#define MULTI_PC                        1 // Exit only, populated by CreatePCMultichoice
+#define MULTI_ENTERINFO                 2
+#define MULTI_CONTEST_INFO              3
+#define MULTI_CONTEST_TYPE              4
+#define MULTI_DECOR_NOREGISTRY          5
+#define MULTI_DECOR_REGISTRY            6
+#define MULTI_REGISTER_MENU             7
+#define MULTI_SSTIDAL_LILYCOVE          8 // Exit only, populated by CreateLilycoveSSTidalMultichoice
+#define MULTI_UNUSED_9                  9
+#define MULTI_UNUSED_10                 10
+#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_VIEWED_PAINTINGS          16
+#define MULTI_YESNOINFO                 17
+#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_CHALLENGEINFO             23
+#define MULTI_LEVEL_MODE                24
+#define MULTI_MECHADOLL1_Q1             25
+#define MULTI_MECHADOLL1_Q2             26
+#define MULTI_MECHADOLL1_Q3             27
+#define MULTI_MECHADOLL2_Q1             28
+#define MULTI_MECHADOLL2_Q2             29
+#define MULTI_MECHADOLL2_Q3             30
+#define MULTI_MECHADOLL3_Q1             31
+#define MULTI_MECHADOLL3_Q2             32
+#define MULTI_MECHADOLL3_Q3             33
+#define MULTI_MECHADOLL4_Q1             34
+#define MULTI_MECHADOLL4_Q2             35
+#define MULTI_MECHADOLL4_Q3             36
+#define MULTI_MECHADOLL5_Q1             37
+#define MULTI_MECHADOLL5_Q2             38
+#define MULTI_MECHADOLL5_Q3             39
+#define MULTI_UNUSED_40                 40
+#define MULTI_UNUSED_41                 41
+#define MULTI_VENDING_MACHINE           42
+#define MULTI_MACH_BIKE_INFO            43
+#define MULTI_ACRO_BIKE_INFO            44
+#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_HOWS_FISHING              50
+#define MULTI_UNUSED_51                 51
+#define MULTI_SSTIDAL_SLATEPORT_1       52 // TODO: rename
+#define MULTI_SSTIDAL_BATTLE_FRONTIER   53
+#define MULTI_RIGHTLEFT                 54
+#define MULTI_GAME_CORNER_TMS           55
+#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
+#define MULTI_SHARDS_B                  61
+#define MULTI_SHARDS_RB                 62
+#define MULTI_SHARDS_YB                 63
+#define MULTI_SHARDS_RYB                64
+#define MULTI_SHARDS_G                  65
+#define MULTI_SHARDS_RG                 66
+#define MULTI_SHARDS_YG                 67
+#define MULTI_SHARDS_RYG                68
+#define MULTI_SHARDS_BG                 69
+#define MULTI_SHARDS_RBG                70
+#define MULTI_SHARDS_YBG                71
+#define MULTI_SHARDS_RYBG               72
+#define MULTI_TOURNEY_WITH_RECORD       73
+#define MULTI_LINK_SERVICES_A1          74 // TODO: rename
+#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_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 were replaced by CreateLilycoveSSTidalMultichoice
+#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_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_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
+
+// Lilycove SS Tidal Multichoice Selections
+#define SSTIDAL_SELECTION_SLATEPORT        0
+#define SSTIDAL_SELECTION_BATTLE_FRONTIER  1
+#define SSTIDAL_SELECTION_SOUTHERN_ISLAND  2
+#define SSTIDAL_SELECTION_NAVEL_ROCK       3
+#define SSTIDAL_SELECTION_BIRTH_ISLAND     4
+#define SSTIDAL_SELECTION_FARAWAY_ISLAND   5
+#define SSTIDAL_SELECTION_EXIT             6
+#define SSTIDAL_SELECTION_COUNT            7
 
 // Std String Ids
 #define STDSTRING_COOL             0
@@ -153,4 +165,4 @@
 #define STDSTRING_BATTLE_PIKE      28
 #define STDSTRING_BATTLE_PYRAMID   29
 
-#endif //GUARD_SCRIPT_MENU_CONSTANTS_H
\ No newline at end of file
+#endif //GUARD_SCRIPT_MENU_CONSTANTS_H
diff --git a/include/script_menu.h b/include/script_menu.h
index 30a8b9b1b..683598bd4 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -9,12 +9,12 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
 bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
 bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
 bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
-int convert_pixel_width_to_tile_width(int);
+int ConvertPixelWidthToTileWidth(int);
 u8 CreateWindowFromRect(u8, u8, u8, u8);
 void ClearToTransparentAndRemoveWindow(u8);
-int display_text_and_get_width(const u8*, int);
-int sub_80E2D5C(int arg0, int tileWidth);
-bool16 ScrSpecial_CreatePCMenu(void);
+int DisplayTextAndGetWidth(const u8*, int);
+int ScriptMenu_AdjustLeftCoordFromWidth(int arg0, int tileWidth);
+bool16 ScriptMenu_CreatePCMultichoice(void);
 void ScriptMenu_DisplayPCStartupPrompt(void);
 
 #endif //GUARD_SCRIPT_MENU_H