From 9f4f0df4d708f720990111034131de703ebfbb19 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Mar 2020 18:38:30 -0400 Subject: fldeff_flash.c --- include/map_preview_screen.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/map_preview_screen.h') diff --git a/include/map_preview_screen.h b/include/map_preview_screen.h index ea85baf71..195e86929 100644 --- a/include/map_preview_screen.h +++ b/include/map_preview_screen.h @@ -50,5 +50,10 @@ u16 sub_80F856C(u8 id); bool8 sub_80F8110(u8 mapsec, bool8 forceFirstTime); bool32 sub_80F83B0(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); #endif //GUARD_MAP_PREVIEW_SCREEN_H -- cgit v1.2.3 From 73e62801445cd2e5367b00a48830e437785128db Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Mar 2020 19:54:02 -0400 Subject: Document fldeff_flash and map_preview_screen --- include/map_preview_screen.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'include/map_preview_screen.h') 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 -- cgit v1.2.3 From 1a8023c46582c2742658ec5c75619d74f33fc3d1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Mar 2020 09:30:13 -0400 Subject: Update MapPreviewScreen.type --- include/map_preview_screen.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include/map_preview_screen.h') diff --git a/include/map_preview_screen.h b/include/map_preview_screen.h index b884403ca..24bf52e9a 100644 --- a/include/map_preview_screen.h +++ b/include/map_preview_screen.h @@ -34,10 +34,14 @@ enum MapPreviewScreenId MPS_COUNT }; +#define MPS_TYPE_CAVE 0 +#define MPS_TYPE_FOREST 1 +#define MPS_TYPE_ANY 2 + struct MapPreviewScreen { u8 mapsec; - bool8 type; + u8 type; u16 flagId; const void * tilesptr; const void * tilemapptr; -- cgit v1.2.3 From 02aed8fc8e2496cc62873fc52de54c89f0b9ac83 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Mar 2020 09:56:00 -0400 Subject: Fix arg type decl in MapHasPreviewScreen --- include/map_preview_screen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/map_preview_screen.h') diff --git a/include/map_preview_screen.h b/include/map_preview_screen.h index 24bf52e9a..a287c6f89 100644 --- a/include/map_preview_screen.h +++ b/include/map_preview_screen.h @@ -51,7 +51,7 @@ struct MapPreviewScreen u16 MapPreview_CreateMapNameWindow(u8 id); void MapPreview_SetFlag(u16 a0); u16 MapPreview_GetDuration(u8 id); -bool8 MapHasPreviewScreen(u8 mapsec, bool8 type); +bool8 MapHasPreviewScreen(u8 mapsec, u8 type); bool32 ForestMapPreviewScreenIsRunning(void); const struct MapPreviewScreen * GetDungeonMapPreviewScreenInfo(u8 mapsec); bool32 MapHasPreviewScreen_HandleQLState2(u8 mapsec, u8 type); -- cgit v1.2.3