diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-08 19:54:02 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-08 19:54:02 -0400 |
commit | 73e62801445cd2e5367b00a48830e437785128db (patch) | |
tree | 8659d67c9198a54decde0d5eeed54e6fd9b708da /include | |
parent | 9f4f0df4d708f720990111034131de703ebfbb19 (diff) |
Document fldeff_flash and map_preview_screen
Diffstat (limited to 'include')
-rw-r--r-- | include/fldeff.h | 4 | ||||
-rw-r--r-- | include/map_preview_screen.h | 22 | ||||
-rw-r--r-- | include/overworld.h | 4 | ||||
-rw-r--r-- | include/quest_log.h | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/include/fldeff.h b/include/fldeff.h index 00f2d01f4..9dd6121b2 100644 --- a/include/fldeff.h +++ b/include/fldeff.h @@ -13,8 +13,8 @@ bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId); u8 CreateFieldEffectShowMon(void); // flash -u8 sub_80C9DCC(u8 lightLevel, u8 mapType); -u8 sub_80C9D7C(u8 mapType1, u8 mapType2); +u8 MapTransitionIsExit(u8 lightLevel, u8 mapType); +u8 MapTransitionIsEnter(u8 mapType1, u8 mapType2); bool8 SetUpFieldMove_Flash(void); // cut diff --git a/include/map_preview_screen.h b/include/map_preview_screen.h index 195e86929..b884403ca 100644 --- a/include/map_preview_screen.h +++ b/include/map_preview_screen.h @@ -37,23 +37,23 @@ enum MapPreviewScreenId struct MapPreviewScreen { u8 mapsec; - bool8 forceFirstTime; + bool8 type; u16 flagId; const void * tilesptr; const void * tilemapptr; const void * palptr; }; -u16 sub_80F8318(u8 id); -void sub_80F85BC(u16 a0); -u16 sub_80F856C(u8 id); -bool8 sub_80F8110(u8 mapsec, bool8 forceFirstTime); -bool32 sub_80F83B0(void); +u16 MapPreview_CreateMapNameWindow(u8 id); +void MapPreview_SetFlag(u16 a0); +u16 MapPreview_GetDuration(u8 id); +bool8 MapHasPreviewScreen(u8 mapsec, bool8 type); +bool32 ForestMapPreviewScreenIsRunning(void); const struct MapPreviewScreen * GetDungeonMapPreviewScreenInfo(u8 mapsec); -bool32 sub_80F8154(u8 mapsec, u8 forceFirstTime); -void sub_80F8180(void); -void sub_80F819C(u8 mapsec); -bool32 sub_80F8258(void); -void sub_80F8234(s32 windowId); +bool32 MapHasPreviewScreen_HandleQLState2(u8 mapsec, u8 type); +void MapPreview_InitBgs(void); +void MapPreview_LoadGfx(u8 mapsec); +bool32 MapPreview_IsGfxLoadFinished(void); +void MapPreview_Unload(s32 windowId); #endif //GUARD_MAP_PREVIEW_SCREEN_H diff --git a/include/overworld.h b/include/overworld.h index 06d4bcb8e..02492f74b 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -157,7 +157,7 @@ void Overworld_ResetStateAfterDigEscRope(void); bool32 sub_8058244(void); u8 GetCurrentMapType(void); -u8 get_map_light_from_warp0(void); +u8 GetLastUsedWarpMapType(void); const struct MapHeader *warp1_get_mapheader(void); void TryFadeOutOldMapMusic(void); void CB2_ReturnToFieldCableClub(void); @@ -192,7 +192,7 @@ void sub_8057F48(void); void SetMainCallback1(MainCallback cb); void CB1_Overworld(void); void sub_80568C4(void); -u8 sub_80561B4(void); +u8 GetLastUsedWarpMapSectionId(void); extern u16 gHeldKeyCodeToSend; diff --git a/include/quest_log.h b/include/quest_log.h index 3241046bc..b2645954f 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -26,7 +26,7 @@ extern const u16 gUnknown_84566A8[]; void sub_8112720(u8); void SetQuestLogEvent(u16, const u16 *); void sub_811539C(void); -void sub_8115748(u16); +void QuestLog_RecordEnteredMap(u16); u8 sub_8112CAC(void); bool8 QuestLog_SchedulePlaybackCB(void (*func)(void)); void sub_8111F38(u16 offset, u16 idx); |