summaryrefslogtreecommitdiff
path: root/include/overworld.h
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-11-04 12:11:31 -0400
committerGitHub <noreply@github.com>2021-11-04 12:11:31 -0400
commitbe7d0bd3b02727affddb422bdd868f2d219fe181 (patch)
tree2a888fe548d140e37456f6916075cc963fb51cee /include/overworld.h
parent17b657d83a29919253675b06c12a9ea5471385b2 (diff)
parent7940f121f66bb0ebe0932bc642c3d9b4015f79a7 (diff)
Merge branch 'master' into doc-menu
Diffstat (limited to 'include/overworld.h')
-rw-r--r--include/overworld.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/overworld.h b/include/overworld.h
index 8005a2222..e1cf100db 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -127,7 +127,7 @@ u8 GetSavedWarpRegionMapSectionId(void);
u8 GetCurrentRegionMapSectionId(void);
u8 GetCurrentMapBattleScene(void);
void CleanupOverworldWindowsAndTilemaps(void);
-bool32 IsUpdateLinkStateCBActive(void);
+bool32 IsOverworldLinkActive(void);
void CB1_Overworld(void);
void CB2_OverworldBasic(void);
void CB2_Overworld(void);
@@ -151,7 +151,7 @@ u16 SetInCableClubSeat(void);
u16 SetLinkWaitingForScript(void);
u16 QueueExitLinkRoomKey(void);
u16 SetStartedCableClubActivity(void);
-bool32 Overworld_LinkRecvQueueLengthMoreThan2(void);
+bool32 Overworld_IsRecvQueueAtMax(void);
bool32 Overworld_RecvKeysFromLinkIsRunning(void);
bool32 Overworld_SendKeysToLinkIsRunning(void);
bool32 IsSendingKeysOverCable(void);