diff options
author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-07-15 04:43:03 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-15 04:43:03 -0700 |
commit | 07ef76277021d5cddf14004e37e785c31fcea69b (patch) | |
tree | 2ddbc42ed88d41986a5db903ddb06ac5bbed0df3 /data | |
parent | 24f6484643ed3d7115fd4ebd92f254f224f1ca97 (diff) | |
parent | 731d6d59bc624e0350b3396f135a35f6c9bdc4f8 (diff) |
Merge pull request #275 from Diegoisawesome/master
Document list_menu.c and main_menu.c
Diffstat (limited to 'data')
-rw-r--r-- | data/maps/BattleFrontier_BattleTowerLobby/scripts.inc | 2 | ||||
-rw-r--r-- | data/maps/LilycoveCity_ContestLobby/scripts.inc | 2 | ||||
-rw-r--r-- | data/rom_8011DC0.s | 20 | ||||
-rw-r--r-- | data/scripts/cable_club.inc | 8 | ||||
-rw-r--r-- | data/scripts/pokeblocks.inc | 2 | ||||
-rw-r--r-- | data/specials.inc | 2 |
6 files changed, 18 insertions, 18 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 478d61656..1cd2ff74a 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -551,7 +551,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8 goto BattleFrontier_BattleTowerLobby_EventScript_23F2C5 diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index a4609ab54..9d37c58ed 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -649,7 +649,7 @@ LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 goto_eq LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27C8FD waitmessage - specialvar VAR_TEMP_D, sub_80093CC + specialvar VAR_TEMP_D, IsWirelessAdapterConnected multichoice 0, 0, 85, 0 switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_21A8BB diff --git a/data/rom_8011DC0.s b/data/rom_8011DC0.s index bcc7dcd1b..2d7e09958 100644 --- a/data/rom_8011DC0.s +++ b/data/rom_8011DC0.s @@ -1315,7 +1315,7 @@ gUnknown_082F0184:: @ 82F0184 .align 2 gUnknown_082F0204:: @ 82F0204 struct ListMenuTemplate .4byte gUnknown_082F0184 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte sub_8013DF4 .byte 0x10, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x40, 0x01 @@ -1351,7 +1351,7 @@ gUnknown_082F0264:: @ 82F0264 .align 2 gUnknown_082F027C:: @ 82F027C .4byte gUnknown_082F0264 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte NULL .byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x00, 0x01 @@ -1384,7 +1384,7 @@ gUnknown_082F029C:: @ 82F029C .align 2 gUnknown_082F032C:: @ 82F032C .4byte gUnknown_082F029C - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte NULL .byte 0x12, 0x00, 0x06, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x00, 0x01 @@ -1413,7 +1413,7 @@ gUnknown_082F0354:: @ 82F0354 .align 2 gUnknown_082F03A4:: @ 82F03A4 .4byte gUnknown_082F0354 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte sub_8017BE8 .byte 0x0a, 0x00, 0x06, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0xe1, 0xdf, 0x00, 0x01 @@ -1442,7 +1442,7 @@ gUnknown_082F03C4:: @ 82F03C4 .align 2 .4byte gUnknown_082F03C4 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte nullsub_14 .byte 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x40, 0x01 @@ -1637,7 +1637,7 @@ gUnknown_082F0620:: @ 82F0620 .align 2 gUnknown_082F0638:: @ 82F0638 struct ListMenuTemplate .4byte NULL - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte NULL .byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x00, 0x01 @@ -1669,7 +1669,7 @@ gUnknown_082F06A0:: @ 82F06A0 .align 2 gUnknown_082F06B0:: @ 82F06B0 struct ListMenuTemplate .4byte gUnknown_082F0650 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte NULL .byte 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x00, 0x01 @@ -1677,7 +1677,7 @@ gUnknown_082F06B0:: @ 82F06B0 struct ListMenuTemplate .align 2 gUnknown_082F06C8:: @ 82F06C8 .4byte gUnknown_082F0670 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte NULL .byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x00, 0x01 @@ -1685,7 +1685,7 @@ gUnknown_082F06C8:: @ 82F06C8 .align 2 gUnknown_082F06E0:: @ 82F06E0 .4byte gUnknown_082F0688 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte NULL .byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x00, 0x01 @@ -1693,7 +1693,7 @@ gUnknown_082F06E0:: @ 82F06E0 .align 2 gUnknown_082F06F8:: @ 82F06F8 .4byte gUnknown_082F06A0 - .4byte sub_81AF078 + .4byte ListMenuDefaultCursorMoveFunc .4byte NULL .byte 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x21, 0x31, 0x00, 0x01 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index f02ffbe66..adf02ddd0 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -999,7 +999,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B copyvar VAR_0x8007, VAR_LAST_TALKED - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277668 message OldaleTown_PokemonCenter_2F_Text_27940D @@ -1108,7 +1108,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 specialvar VAR_RESULT, sub_813990C compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276E13 message OldaleTown_PokemonCenter_2F_Text_279013 @@ -1396,7 +1396,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B8A:: @ 8277B8A lockall checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27733F - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 goto_eq EventScript_277BB4 fadescreen 1 @@ -1495,7 +1495,7 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91 faceplayer message MossdeepCity_GameCorner_1F_Text_278CEB waitmessage - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E48 delay 60 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 9c4b46ae2..bd8d0cd0c 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -594,7 +594,7 @@ LilycoveCity_ContestLobby_EventScript_2940BB:: @ 82940BB call LilycoveCity_ContestLobby_EventScript_27134F compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_294160 - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_2941ED message LilycoveCity_ContestLobby_Text_293955 diff --git a/data/specials.inc b/data/specials.inc index dfbac56fa..1020b1c80 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -423,7 +423,7 @@ gSpecials:: @ 81DBA64 def_special sub_81BE79C def_special sub_81BE7F4 def_special sub_81398C0 - def_special sub_80093CC + def_special IsWirelessAdapterConnected def_special BerryBlenderLinkBecomeLeader def_special BerryBlenderLinkJoinGroup def_special UnionRoomSpecial |