dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Document fldeff_flash and map_preview_screen

Browse Source
This commit is contained in:
PikalaxALT
2020-03-08 19:54:02 -04:00
parent 9f4f0df4d7
commit 73e6280144
10 changed files with 251 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/overworld.s
+15 -15
View File
@@ -1739,7 +1739,7 @@ _080558D4:
bl DoCurrentWeather bl DoCurrentWeather
bl ResetFieldTasksArgs bl ResetFieldTasksArgs
bl mapheader_run_script_with_tag_x5 bl mapheader_run_script_with_tag_x5
bl sub_80561B4 bl GetLastUsedWarpMapSectionId
ldr r1, _0805591C @ =gMapHeader ldr r1, _0805591C @ =gMapHeader
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2899,8 +2899,8 @@ GetCurrentMapType: @ 8056188
_0805619C: .4byte gSaveBlock1Ptr _0805619C: .4byte gSaveBlock1Ptr
thumb_func_end GetCurrentMapType thumb_func_end GetCurrentMapType
thumb_func_start get_map_light_from_warp0 thumb_func_start GetLastUsedWarpMapType
get_map_light_from_warp0: @ 80561A0 GetLastUsedWarpMapType: @ 80561A0
push {lr} push {lr}
ldr r0, _080561B0 @ =gUnknown_2031DB4 ldr r0, _080561B0 @ =gUnknown_2031DB4
bl get_map_light_level_from_warp bl get_map_light_level_from_warp
@@ -2910,10 +2910,10 @@ get_map_light_from_warp0: @ 80561A0
bx r1 bx r1
.align 2, 0 .align 2, 0
_080561B0: .4byte gUnknown_2031DB4 _080561B0: .4byte gUnknown_2031DB4
thumb_func_end get_map_light_from_warp0 thumb_func_end GetLastUsedWarpMapType
thumb_func_start sub_80561B4 thumb_func_start GetLastUsedWarpMapSectionId
sub_80561B4: @ 80561B4 GetLastUsedWarpMapSectionId: @ 80561B4
push {lr} push {lr}
ldr r1, _080561D4 @ =gUnknown_2031DB4 ldr r1, _080561D4 @ =gUnknown_2031DB4
movs r0, 0 movs r0, 0
@@ -2931,7 +2931,7 @@ sub_80561B4: @ 80561B4
bx r1 bx r1
.align 2, 0 .align 2, 0
_080561D4: .4byte gUnknown_2031DB4 _080561D4: .4byte gUnknown_2031DB4
thumb_func_end sub_80561B4 thumb_func_end GetLastUsedWarpMapSectionId
thumb_func_start IsMapTypeOutdoors thumb_func_start IsMapTypeOutdoors
IsMapTypeOutdoors: @ 80561D8 IsMapTypeOutdoors: @ 80561D8
@@ -3579,7 +3579,7 @@ CB2_LoadMap: @ 805671C
bl ScriptContext2_Disable bl ScriptContext2_Disable
movs r0, 0 movs r0, 0
bl SetMainCallback1 bl SetMainCallback1
ldr r0, _08056740 @ =sub_80C9BFC ldr r0, _08056740 @ =CB2_DoChangeMap
bl SetMainCallback2 bl SetMainCallback2
ldr r1, _08056744 @ =gMain ldr r1, _08056744 @ =gMain
ldr r0, _08056748 @ =sub_805674C ldr r0, _08056748 @ =sub_805674C
@@ -3587,7 +3587,7 @@ CB2_LoadMap: @ 805671C
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08056740: .4byte sub_80C9BFC _08056740: .4byte CB2_DoChangeMap
_08056744: .4byte gMain _08056744: .4byte gMain
_08056748: .4byte sub_805674C _08056748: .4byte sub_805674C
thumb_func_end CB2_LoadMap thumb_func_end CB2_LoadMap
@@ -4196,7 +4196,7 @@ _08056C72:
bl InitTilesetAnimations bl InitTilesetAnimations
b _08056CCA b _08056CCA
_08056C78: _08056C78:
bl sub_80561B4 bl GetLastUsedWarpMapSectionId
ldr r5, _08056CA4 @ =gMapHeader ldr r5, _08056CA4 @ =gMapHeader
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -4205,13 +4205,13 @@ _08056C78:
beq _08056CA8 beq _08056CA8
ldrb r0, [r5, 0x14] ldrb r0, [r5, 0x14]
movs r1, 0x1 movs r1, 0x1
bl sub_80F8154 bl MapHasPreviewScreen_HandleQLState2
cmp r0, 0x1 cmp r0, 0x1
bne _08056CA8 bne _08056CA8
ldrb r0, [r5, 0x14] ldrb r0, [r5, 0x14]
bl sub_80F819C bl MapPreview_LoadGfx
ldrb r0, [r5, 0x14] ldrb r0, [r5, 0x14]
bl sub_80F8268 bl MapPreview_StartForestTransition
b _08056CCA b _08056CCA
.align 2, 0 .align 2, 0
_08056CA4: .4byte gMapHeader _08056CA4: .4byte gMapHeader
@@ -4922,7 +4922,7 @@ sub_805726C: @ 805726C
bl ScriptContext2_Disable bl ScriptContext2_Disable
movs r0, 0 movs r0, 0
bl SetMainCallback1 bl SetMainCallback1
ldr r0, _0805729C @ =sub_80C9BFC ldr r0, _0805729C @ =CB2_DoChangeMap
bl SetMainCallback2 bl SetMainCallback2
ldr r1, _080572A0 @ =gMain ldr r1, _080572A0 @ =gMain
ldr r0, _080572A4 @ =sub_80572D8 ldr r0, _080572A4 @ =sub_80572D8
@@ -4931,7 +4931,7 @@ sub_805726C: @ 805726C
bx r0 bx r0
.align 2, 0 .align 2, 0
_08057298: .4byte gUnknown_2036E28 _08057298: .4byte gUnknown_2036E28
_0805729C: .4byte sub_80C9BFC _0805729C: .4byte CB2_DoChangeMap
_080572A0: .4byte gMain _080572A0: .4byte gMain
_080572A4: .4byte sub_80572D8 _080572A4: .4byte sub_80572D8
thumb_func_end sub_805726C thumb_func_end sub_805726C
include/fldeff.h
+2 -2
View File
@@ -13,8 +13,8 @@ bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
u8 CreateFieldEffectShowMon(void); u8 CreateFieldEffectShowMon(void);
// flash // flash
u8 sub_80C9DCC(u8 lightLevel, u8 mapType); u8 MapTransitionIsExit(u8 lightLevel, u8 mapType);
u8 sub_80C9D7C(u8 mapType1, u8 mapType2); u8 MapTransitionIsEnter(u8 mapType1, u8 mapType2);
bool8 SetUpFieldMove_Flash(void); bool8 SetUpFieldMove_Flash(void);
// cut // cut
include/map_preview_screen.h
+11 -11
View File
@@ -37,23 +37,23 @@ enum MapPreviewScreenId
struct MapPreviewScreen struct MapPreviewScreen
{ {
u8 mapsec; u8 mapsec;
bool8 forceFirstTime; bool8 type;
u16 flagId; u16 flagId;
const void * tilesptr; const void * tilesptr;
const void * tilemapptr; const void * tilemapptr;
const void * palptr; const void * palptr;
}; };
u16 sub_80F8318(u8 id); u16 MapPreview_CreateMapNameWindow(u8 id);
void sub_80F85BC(u16 a0); void MapPreview_SetFlag(u16 a0);
u16 sub_80F856C(u8 id); u16 MapPreview_GetDuration(u8 id);
bool8 sub_80F8110(u8 mapsec, bool8 forceFirstTime); bool8 MapHasPreviewScreen(u8 mapsec, bool8 type);
bool32 sub_80F83B0(void); bool32 ForestMapPreviewScreenIsRunning(void);
const struct MapPreviewScreen * GetDungeonMapPreviewScreenInfo(u8 mapsec); const struct MapPreviewScreen * GetDungeonMapPreviewScreenInfo(u8 mapsec);
bool32 sub_80F8154(u8 mapsec, u8 forceFirstTime); bool32 MapHasPreviewScreen_HandleQLState2(u8 mapsec, u8 type);
void sub_80F8180(void); void MapPreview_InitBgs(void);
void sub_80F819C(u8 mapsec); void MapPreview_LoadGfx(u8 mapsec);
bool32 sub_80F8258(void); bool32 MapPreview_IsGfxLoadFinished(void);
void sub_80F8234(s32 windowId); void MapPreview_Unload(s32 windowId);
#endif //GUARD_MAP_PREVIEW_SCREEN_H #endif //GUARD_MAP_PREVIEW_SCREEN_H
include/overworld.h
+2 -2
View File
@@ -157,7 +157,7 @@ void Overworld_ResetStateAfterDigEscRope(void);
bool32 sub_8058244(void); bool32 sub_8058244(void);
u8 GetCurrentMapType(void); u8 GetCurrentMapType(void);
u8 get_map_light_from_warp0(void); u8 GetLastUsedWarpMapType(void);
const struct MapHeader *warp1_get_mapheader(void); const struct MapHeader *warp1_get_mapheader(void);
void TryFadeOutOldMapMusic(void); void TryFadeOutOldMapMusic(void);
void CB2_ReturnToFieldCableClub(void); void CB2_ReturnToFieldCableClub(void);
@@ -192,7 +192,7 @@ void sub_8057F48(void);
void SetMainCallback1(MainCallback cb); void SetMainCallback1(MainCallback cb);
void CB1_Overworld(void); void CB1_Overworld(void);
void sub_80568C4(void); void sub_80568C4(void);
u8 sub_80561B4(void); u8 GetLastUsedWarpMapSectionId(void);
extern u16 gHeldKeyCodeToSend; extern u16 gHeldKeyCodeToSend;
include/quest_log.h
+1 -1
View File
@@ -26,7 +26,7 @@ extern const u16 gUnknown_84566A8[];
void sub_8112720(u8); void sub_8112720(u8);
void SetQuestLogEvent(u16, const u16 *); void SetQuestLogEvent(u16, const u16 *);
void sub_811539C(void); void sub_811539C(void);
void sub_8115748(u16); void QuestLog_RecordEnteredMap(u16);
u8 sub_8112CAC(void); u8 sub_8112CAC(void);
bool8 QuestLog_SchedulePlaybackCB(void (*func)(void)); bool8 QuestLog_SchedulePlaybackCB(void (*func)(void));
void sub_8111F38(u16 offset, u16 idx); void sub_8111F38(u16 offset, u16 idx);
src/field_fadetransition.c
+7 -7
View File
@@ -52,7 +52,7 @@ void palette_bg_faded_fill_black(void)
void WarpFadeInScreen(void) void WarpFadeInScreen(void)
{ {
switch (sub_80C9DCC(get_map_light_from_warp0(), GetCurrentMapType())) switch (MapTransitionIsExit(GetLastUsedWarpMapType(), GetCurrentMapType()))
{ {
case 0: case 0:
palette_bg_faded_fill_black(); palette_bg_faded_fill_black();
@@ -69,7 +69,7 @@ void WarpFadeInScreen(void)
static void sub_807DBAC(void) static void sub_807DBAC(void)
{ {
switch (sub_80C9DCC(get_map_light_from_warp0(), GetCurrentMapType())) switch (MapTransitionIsExit(GetLastUsedWarpMapType(), GetCurrentMapType()))
{ {
case 0: case 0:
palette_bg_faded_fill_black(); palette_bg_faded_fill_black();
@@ -94,11 +94,11 @@ void FadeInFromBlack(void)
void WarpFadeOutScreen(void) void WarpFadeOutScreen(void)
{ {
const struct MapHeader *header = warp1_get_mapheader(); const struct MapHeader *header = warp1_get_mapheader();
if (header->regionMapSectionId != gMapHeader.regionMapSectionId && sub_80F8110(header->regionMapSectionId, FALSE)) if (header->regionMapSectionId != gMapHeader.regionMapSectionId && MapHasPreviewScreen(header->regionMapSectionId, FALSE))
FadeScreen(1, 0); FadeScreen(1, 0);
else else
{ {
switch (sub_80C9D7C(GetCurrentMapType(), header->mapType)) switch (MapTransitionIsEnter(GetCurrentMapType(), header->mapType))
{ {
case 0: case 0:
FadeScreen(1, 0); FadeScreen(1, 0);
@@ -112,7 +112,7 @@ void WarpFadeOutScreen(void)
static void sub_807DC70(void) static void sub_807DC70(void)
{ {
switch (sub_80C9D7C(GetCurrentMapType(), warp1_get_mapheader()->mapType)) switch (MapTransitionIsEnter(GetCurrentMapType(), warp1_get_mapheader()->mapType))
{ {
case 0: case 0:
FadeScreen(1, 3); FadeScreen(1, 3);
@@ -246,7 +246,7 @@ static void sub_807DE78(bool8 a0)
if (MetatileBehavior_IsWarpDoor_2(behavior) == TRUE) if (MetatileBehavior_IsWarpDoor_2(behavior) == TRUE)
{ {
func = sub_807DFBC; func = sub_807DFBC;
switch (sub_80C9DCC(get_map_light_from_warp0(), GetCurrentMapType())) switch (MapTransitionIsExit(GetLastUsedWarpMapType(), GetCurrentMapType()))
{ {
case 0: case 0:
palette_bg_faded_fill_black(); palette_bg_faded_fill_black();
@@ -521,7 +521,7 @@ static bool32 sub_807E40C(void)
bool32 sub_807E418(void) bool32 sub_807E418(void)
{ {
if (IsWeatherNotFadingIn() == TRUE && sub_80F83B0()) if (IsWeatherNotFadingIn() == TRUE && ForestMapPreviewScreenIsRunning())
return TRUE; return TRUE;
else else
return FALSE; return FALSE;
src/fldeff_flash.c
+140 -137
View File
@@ -9,6 +9,7 @@
#include "party_menu.h" #include "party_menu.h"
#include "script.h" #include "script.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/map_types.h"
struct FlashStruct struct FlashStruct
{ {
@@ -20,136 +21,136 @@ struct FlashStruct
void (*func2)(u8 mapSecId); void (*func2)(u8 mapSecId);
}; };
static void sub_80C9B74(void); static void FieldCallback_Flash(void);
static void sub_80C9BB0(void); static void FldEff_UseFlash(void);
static bool8 sub_80C9CE8(void); static bool8 TryDoMapTransition(void);
static void sub_80C9E1C(void); static void FlashTransition_Exit(void);
static void sub_80C9E30(u8 taskId); static void Task_FlashTransition_Exit_0(u8 taskId);
static void sub_80C9E4C(u8 taskId); static void Task_FlashTransition_Exit_1(u8 taskId);
static void sub_80C9EF0(u8 taskId); static void Task_FlashTransition_Exit_2(u8 taskId);
static void sub_80C9F38(u8 taskId); static void Task_FlashTransition_Exit_3(u8 taskId);
static void sub_80C9FA0(u8 taskId); static void Task_FlashTransition_Exit_4(u8 taskId);
static void sub_80C9FD4(void); static void FlashTransition_Enter(void);
static void sub_80C9FE8(u8 taskId); static void Task_FlashTransition_Enter_0(u8 taskId);
static void sub_80CA004(u8 taskId); static void Task_FlashTransition_Enter_1(u8 taskId);
static void sub_80CA0A4(u8 taskId); static void Task_FlashTransition_Enter_2(u8 taskId);
static void sub_80CA108(u8 taskId); static void Task_FlashTransition_Enter_3(u8 taskId);
static void sub_80CA160(u8 mapsecId); static void RunMapPreviewScreen(u8 mapsecId);
static void sub_80CA190(u8 taskId); static void Task_MapPreviewScreen_0(u8 taskId);
static const struct FlashStruct gUnknown_83F5738[] = { static const struct FlashStruct sTransitionTypes[] = {
{ {
.fromType = 1, .fromType = MAP_TYPE_TOWN,
.toType = 4, .toType = MAP_TYPE_UNDERGROUND,
.isEnter = TRUE, .isEnter = TRUE,
.isExit = FALSE, .isExit = FALSE,
.func1 = sub_80C9FD4, .func1 = FlashTransition_Enter,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 2, .fromType = MAP_TYPE_CITY,
.toType = 4, .toType = MAP_TYPE_UNDERGROUND,
.isEnter = TRUE, .isEnter = TRUE,
.isExit = FALSE, .isExit = FALSE,
.func1 = sub_80C9FD4, .func1 = FlashTransition_Enter,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 3, .fromType = MAP_TYPE_ROUTE,
.toType = 4, .toType = MAP_TYPE_UNDERGROUND,
.isEnter = TRUE, .isEnter = TRUE,
.isExit = FALSE, .isExit = FALSE,
.func1 = sub_80C9FD4, .func1 = FlashTransition_Enter,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 5, .fromType = MAP_TYPE_UNDERWATER,
.toType = 4, .toType = MAP_TYPE_UNDERGROUND,
.isEnter = TRUE, .isEnter = TRUE,
.isExit = FALSE, .isExit = FALSE,
.func1 = sub_80C9FD4, .func1 = FlashTransition_Enter,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 6, .fromType = MAP_TYPE_OCEAN_ROUTE,
.toType = 4, .toType = MAP_TYPE_UNDERGROUND,
.isEnter = TRUE, .isEnter = TRUE,
.isExit = FALSE, .isExit = FALSE,
.func1 = sub_80C9FD4, .func1 = FlashTransition_Enter,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 7, .fromType = MAP_TYPE_UNKNOWN,
.toType = 4, .toType = MAP_TYPE_UNDERGROUND,
.isEnter = TRUE, .isEnter = TRUE,
.isExit = FALSE, .isExit = FALSE,
.func1 = sub_80C9FD4, .func1 = FlashTransition_Enter,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 8, .fromType = MAP_TYPE_INDOOR,
.toType = 4, .toType = MAP_TYPE_UNDERGROUND,
.isEnter = TRUE, .isEnter = TRUE,
.isExit = FALSE, .isExit = FALSE,
.func1 = sub_80C9FD4, .func1 = FlashTransition_Enter,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 9, .fromType = MAP_TYPE_SECRET_BASE,
.toType = 4, .toType = MAP_TYPE_UNDERGROUND,
.isEnter = TRUE, .isEnter = TRUE,
.isExit = FALSE, .isExit = FALSE,
.func1 = sub_80C9FD4, .func1 = FlashTransition_Enter,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 4, .fromType = MAP_TYPE_UNDERGROUND,
.toType = 1, .toType = MAP_TYPE_TOWN,
.isEnter = FALSE, .isEnter = FALSE,
.isExit = TRUE, .isExit = TRUE,
.func1 = sub_80C9E1C, .func1 = FlashTransition_Exit,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 4, .fromType = MAP_TYPE_UNDERGROUND,
.toType = 2, .toType = MAP_TYPE_CITY,
.isEnter = FALSE, .isEnter = FALSE,
.isExit = TRUE, .isExit = TRUE,
.func1 = sub_80C9E1C, .func1 = FlashTransition_Exit,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 4, .fromType = MAP_TYPE_UNDERGROUND,
.toType = 3, .toType = MAP_TYPE_ROUTE,
.isEnter = FALSE, .isEnter = FALSE,
.isExit = TRUE, .isExit = TRUE,
.func1 = sub_80C9E1C, .func1 = FlashTransition_Exit,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 4, .fromType = MAP_TYPE_UNDERGROUND,
.toType = 5, .toType = MAP_TYPE_UNDERWATER,
.isEnter = FALSE, .isEnter = FALSE,
.isExit = TRUE, .isExit = TRUE,
.func1 = sub_80C9E1C, .func1 = FlashTransition_Exit,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 4, .fromType = MAP_TYPE_UNDERGROUND,
.toType = 6, .toType = MAP_TYPE_OCEAN_ROUTE,
.isEnter = FALSE, .isEnter = FALSE,
.isExit = TRUE, .isExit = TRUE,
.func1 = sub_80C9E1C, .func1 = FlashTransition_Exit,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 4, .fromType = MAP_TYPE_UNDERGROUND,
.toType = 7, .toType = MAP_TYPE_UNKNOWN,
.isEnter = FALSE, .isEnter = FALSE,
.isExit = TRUE, .isExit = TRUE,
.func1 = sub_80C9E1C, .func1 = FlashTransition_Exit,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 4, .fromType = MAP_TYPE_UNDERGROUND,
.toType = 8, .toType = MAP_TYPE_INDOOR,
.isEnter = FALSE, .isEnter = FALSE,
.isExit = TRUE, .isExit = TRUE,
.func1 = sub_80C9E1C, .func1 = FlashTransition_Exit,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, { }, {
.fromType = 4, .fromType = MAP_TYPE_UNDERGROUND,
.toType = 9, .toType = MAP_TYPE_SECRET_BASE,
.isEnter = FALSE, .isEnter = FALSE,
.isExit = TRUE, .isExit = TRUE,
.func1 = sub_80C9E1C, .func1 = FlashTransition_Exit,
.func2 = sub_80CA160 .func2 = RunMapPreviewScreen
}, {0} }, {0}
}; };
@@ -168,26 +169,28 @@ bool8 SetUpFieldMove_Flash(void)
return FALSE; return FALSE;
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
gPostMenuFieldCallback = sub_80C9B74; gPostMenuFieldCallback = FieldCallback_Flash;
return TRUE; return TRUE;
} }
static void sub_80C9B74(void) static void FieldCallback_Flash(void)
{ {
u8 taskId = CreateFieldEffectShowMon(); u8 taskId = CreateFieldEffectShowMon();
gFieldEffectArguments[0] = GetCursorSelectionMonId(); gFieldEffectArguments[0] = GetCursorSelectionMonId();
gTasks[taskId].data[8] = ((uintptr_t)sub_80C9BB0) >> 16; gTasks[taskId].data[8] = ((uintptr_t)FldEff_UseFlash) >> 16;
gTasks[taskId].data[9] = ((uintptr_t)sub_80C9BB0); gTasks[taskId].data[9] = ((uintptr_t)FldEff_UseFlash);
} }
static void sub_80C9BB0(void) static void FldEff_UseFlash(void)
{ {
PlaySE(SE_W115); PlaySE(SE_W115);
FlagSet(FLAG_SYS_FLASH_ACTIVE); FlagSet(FLAG_SYS_FLASH_ACTIVE);
ScriptContext1_SetupScript(EventScript_FldEffFlash); ScriptContext1_SetupScript(EventScript_FldEffFlash);
} }
static void sub_80C9BD0(void) // Map transition animatics
static void CB2_ChangeMapMain(void)
{ {
RunTasks(); RunTasks();
AnimateSprites(); AnimateSprites();
@@ -195,14 +198,14 @@ static void sub_80C9BD0(void)
UpdatePaletteFade(); UpdatePaletteFade();
} }
static void sub_80C9BE8(void) static void VBC_ChangeMapVBlank(void)
{ {
LoadOam(); LoadOam();
ProcessSpriteCopyRequests(); ProcessSpriteCopyRequests();
TransferPlttBuffer(); TransferPlttBuffer();
} }
void sub_80C9BFC(void) void CB2_DoChangeMap(void)
{ {
SetVBlankCallback(NULL); SetVBlankCallback(NULL);
@@ -224,74 +227,74 @@ void sub_80C9BFC(void)
ResetTasks(); ResetTasks();
ResetSpriteData(); ResetSpriteData();
EnableInterrupts(INTR_FLAG_VBLANK); EnableInterrupts(INTR_FLAG_VBLANK);
SetVBlankCallback(sub_80C9BE8); SetVBlankCallback(VBC_ChangeMapVBlank);
SetMainCallback2(sub_80C9BD0); SetMainCallback2(CB2_ChangeMapMain);
if (!sub_80C9CE8()) if (!TryDoMapTransition())
SetMainCallback2(gMain.savedCallback); SetMainCallback2(gMain.savedCallback);
} }
static bool8 sub_80C9CE8(void) static bool8 TryDoMapTransition(void)
{ {
u8 fromType = get_map_light_from_warp0(); u8 fromType = GetLastUsedWarpMapType();
u8 toType = GetCurrentMapType(); u8 toType = GetCurrentMapType();
u8 i = 0; u8 i = 0;
if (sub_80561B4() != gMapHeader.regionMapSectionId && sub_80F8154(gMapHeader.regionMapSectionId, FALSE) == TRUE) if (GetLastUsedWarpMapSectionId() != gMapHeader.regionMapSectionId && MapHasPreviewScreen_HandleQLState2(gMapHeader.regionMapSectionId, FALSE) == TRUE)
{ {
sub_80CA160(gMapHeader.regionMapSectionId); RunMapPreviewScreen(gMapHeader.regionMapSectionId);
return TRUE; return TRUE;
} }
for (; gUnknown_83F5738[i].fromType != 0; i++) for (; sTransitionTypes[i].fromType != 0; i++)
{ {
if (gUnknown_83F5738[i].fromType == fromType && gUnknown_83F5738[i].toType == toType) if (sTransitionTypes[i].fromType == fromType && sTransitionTypes[i].toType == toType)
{ {
gUnknown_83F5738[i].func1(); sTransitionTypes[i].func1();
return TRUE; return TRUE;
} }
} }
return FALSE; return FALSE;
} }
bool8 sub_80C9D7C(u8 _fromType, u8 _toType) bool8 MapTransitionIsEnter(u8 _fromType, u8 _toType)
{ {
u8 fromType = _fromType; u8 fromType = _fromType;
u8 toType = _toType; u8 toType = _toType;
u8 i = 0; u8 i = 0;
for (; gUnknown_83F5738[i].fromType != 0; i++) for (; sTransitionTypes[i].fromType != 0; i++)
{ {
if (gUnknown_83F5738[i].fromType == fromType && gUnknown_83F5738[i].toType == toType) if (sTransitionTypes[i].fromType == fromType && sTransitionTypes[i].toType == toType)
{ {
return gUnknown_83F5738[i].isEnter; return sTransitionTypes[i].isEnter;
} }
} }
return FALSE; return FALSE;
} }
bool8 sub_80C9DCC(u8 _fromType, u8 _toType) bool8 MapTransitionIsExit(u8 _fromType, u8 _toType)
{ {
u8 fromType = _fromType; u8 fromType = _fromType;
u8 toType = _toType; u8 toType = _toType;
u8 i = 0; u8 i = 0;
for (; gUnknown_83F5738[i].fromType != 0; i++) for (; sTransitionTypes[i].fromType != 0; i++)
{ {
if (gUnknown_83F5738[i].fromType == fromType && gUnknown_83F5738[i].toType == toType) if (sTransitionTypes[i].fromType == fromType && sTransitionTypes[i].toType == toType)
{ {
return gUnknown_83F5738[i].isExit; return sTransitionTypes[i].isExit;
} }
} }
return FALSE; return FALSE;
} }
static void sub_80C9E1C(void) static void FlashTransition_Exit(void)
{ {
CreateTask(sub_80C9E30, 0); CreateTask(Task_FlashTransition_Exit_0, 0);
} }
static void sub_80C9E30(u8 taskId) static void Task_FlashTransition_Exit_0(u8 taskId)
{ {
gTasks[taskId].func = sub_80C9E4C; gTasks[taskId].func = Task_FlashTransition_Exit_1;
} }
static void sub_80C9E4C(u8 taskId) static void Task_FlashTransition_Exit_1(u8 taskId)
{ {
SetGpuReg(REG_OFFSET_DISPCNT, 0); SetGpuReg(REG_OFFSET_DISPCNT, 0);
LZ77UnCompVram(gUnknown_83F5A44, (void *)BG_CHAR_ADDR(3)); LZ77UnCompVram(gUnknown_83F5A44, (void *)BG_CHAR_ADDR(3));
@@ -303,12 +306,12 @@ static void sub_80C9E4C(u8 taskId)
SetGpuReg(REG_OFFSET_BLDY, 0); SetGpuReg(REG_OFFSET_BLDY, 0);
SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(3) | BGCNT_SCREENBASE(31)); SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(3) | BGCNT_SCREENBASE(31));
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_OBJ_ON); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_OBJ_ON);
gTasks[taskId].func = sub_80C9EF0; gTasks[taskId].func = Task_FlashTransition_Exit_2;
gTasks[taskId].data[0] = 16; gTasks[taskId].data[0] = 16;
gTasks[taskId].data[1] = 0; gTasks[taskId].data[1] = 0;
} }
static void sub_80C9EF0(u8 taskId) static void Task_FlashTransition_Exit_2(u8 taskId)
{ {
u16 r4 = gTasks[taskId].data[1]; u16 r4 = gTasks[taskId].data[1];
SetGpuReg(REG_OFFSET_BLDALPHA, (16 << 8) + r4); SetGpuReg(REG_OFFSET_BLDALPHA, (16 << 8) + r4);
@@ -319,11 +322,11 @@ static void sub_80C9EF0(u8 taskId)
else else
{ {
gTasks[taskId].data[2] = 0; gTasks[taskId].data[2] = 0;
gTasks[taskId].func = sub_80C9F38; gTasks[taskId].func = Task_FlashTransition_Exit_3;
} }
} }
static void sub_80C9F38(u8 taskId) static void Task_FlashTransition_Exit_3(u8 taskId)
{ {
u16 r4; u16 r4;
SetGpuReg(REG_OFFSET_BLDALPHA, (16 << 8) + 16); SetGpuReg(REG_OFFSET_BLDALPHA, (16 << 8) + 16);
@@ -336,12 +339,12 @@ static void sub_80C9F38(u8 taskId)
else else
{ {
LoadPalette(gUnknown_83F5804, 0x00, 0x20); LoadPalette(gUnknown_83F5804, 0x00, 0x20);
gTasks[taskId].func = sub_80C9FA0; gTasks[taskId].func = Task_FlashTransition_Exit_4;
gTasks[taskId].data[2] = 8; gTasks[taskId].data[2] = 8;
} }
} }
static void sub_80C9FA0(u8 taskId) static void Task_FlashTransition_Exit_4(u8 taskId)
{ {
if (gTasks[taskId].data[2] != 0) if (gTasks[taskId].data[2] != 0)
gTasks[taskId].data[2]--; gTasks[taskId].data[2]--;
@@ -349,17 +352,17 @@ static void sub_80C9FA0(u8 taskId)
SetMainCallback2(gMain.savedCallback); SetMainCallback2(gMain.savedCallback);
} }
static void sub_80C9FD4(void) static void FlashTransition_Enter(void)
{ {
CreateTask(sub_80C9FE8, 0); CreateTask(Task_FlashTransition_Enter_0, 0);
} }
static void sub_80C9FE8(u8 taskId) static void Task_FlashTransition_Enter_0(u8 taskId)
{ {
gTasks[taskId].func = sub_80CA004; gTasks[taskId].func = Task_FlashTransition_Enter_1;
} }
static void sub_80CA004(u8 taskId) static void Task_FlashTransition_Enter_1(u8 taskId)
{ {
SetGpuReg(REG_OFFSET_DISPCNT, 0); SetGpuReg(REG_OFFSET_DISPCNT, 0);
LZ77UnCompVram(gUnknown_83F5A44, (void *)BG_CHAR_ADDR(3)); LZ77UnCompVram(gUnknown_83F5A44, (void *)BG_CHAR_ADDR(3));
@@ -371,13 +374,13 @@ static void sub_80CA004(u8 taskId)
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_OBJ_ON); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_OBJ_ON);
LoadPalette(gUnknown_83F5804, 0xE0, 0x20); LoadPalette(gUnknown_83F5804, 0xE0, 0x20);
LoadPalette(gUnknown_83F5824, 0, 0x20); LoadPalette(gUnknown_83F5824, 0, 0x20);
gTasks[taskId].func = sub_80CA0A4; gTasks[taskId].func = Task_FlashTransition_Enter_2;
gTasks[taskId].data[0] = 16; gTasks[taskId].data[0] = 16;
gTasks[taskId].data[1] = 0; gTasks[taskId].data[1] = 0;
gTasks[taskId].data[2] = 0; gTasks[taskId].data[2] = 0;
} }
static void sub_80CA0A4(u8 taskId) static void Task_FlashTransition_Enter_2(u8 taskId)
{ {
u16 r4; u16 r4;
r4 = gTasks[taskId].data[2]; r4 = gTasks[taskId].data[2];
@@ -391,11 +394,11 @@ static void sub_80CA0A4(u8 taskId)
{ {
SetGpuReg(REG_OFFSET_BLDALPHA, (16 << 8) + 16); SetGpuReg(REG_OFFSET_BLDALPHA, (16 << 8) + 16);
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD);
gTasks[taskId].func = sub_80CA108; gTasks[taskId].func = Task_FlashTransition_Enter_3;
} }
} }
static void sub_80CA108(u8 taskId) static void Task_FlashTransition_Enter_3(u8 taskId)
{ {
u16 r4 = 16 - gTasks[taskId].data[1]; u16 r4 = 16 - gTasks[taskId].data[1];
SetGpuReg(REG_OFFSET_BLDALPHA, (16 << 8) + r4); SetGpuReg(REG_OFFSET_BLDALPHA, (16 << 8) + r4);
@@ -410,13 +413,13 @@ static void sub_80CA108(u8 taskId)
} }
} }
static void sub_80CA160(u8 mapSecId) static void RunMapPreviewScreen(u8 mapSecId)
{ {
u8 taskId = CreateTask(sub_80CA190, 0); u8 taskId = CreateTask(Task_MapPreviewScreen_0, 0);
gTasks[taskId].data[3] = mapSecId; gTasks[taskId].data[3] = mapSecId;
} }
static void sub_80CA190(u8 taskId) static void Task_MapPreviewScreen_0(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
switch (data[0]) switch (data[0])
@@ -424,15 +427,15 @@ static void sub_80CA190(u8 taskId)
case 0: case 0:
SetWordTaskArg(taskId, 5, (uintptr_t)gMain.vblankCallback); SetWordTaskArg(taskId, 5, (uintptr_t)gMain.vblankCallback);
SetVBlankCallback(NULL); SetVBlankCallback(NULL);
sub_80F8180(); MapPreview_InitBgs();
sub_80F819C(data[3]); MapPreview_LoadGfx(data[3]);
BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK); BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK);
data[0]++; data[0]++;
break; break;
case 1: case 1:
if (!sub_80F8258()) if (!MapPreview_IsGfxLoadFinished())
{ {
data[4] = sub_80F8318(data[3]); data[4] = MapPreview_CreateMapNameWindow(data[3]);
CopyWindowToVram(data[4], 3); CopyWindowToVram(data[4], 3);
data[0]++; data[0]++;
} }
@@ -448,7 +451,7 @@ static void sub_80CA190(u8 taskId)
case 3: case 3:
if (!UpdatePaletteFade()) if (!UpdatePaletteFade())
{ {
data[2] = sub_80F856C(data[3]); data[2] = MapPreview_GetDuration(data[3]);
data[0]++; data[0]++;
} }
break; break;
@@ -468,8 +471,8 @@ static void sub_80CA190(u8 taskId)
{ {
data[i] = 0; data[i] = 0;
} }
sub_80F8234(data[4]); MapPreview_Unload(data[4]);
gTasks[taskId].func = sub_80CA004; gTasks[taskId].func = Task_FlashTransition_Enter_1;
} }
break; break;
} }
src/map_preview_screen.c
+70 -70
View File
@@ -16,10 +16,10 @@
#include "map_preview_screen.h" #include "map_preview_screen.h"
#include "constants/region_map.h" #include "constants/region_map.h"
static EWRAM_DATA bool8 gUnknown_203ABEC = FALSE; static EWRAM_DATA bool8 sHasVisitedMapBefore = FALSE;
static EWRAM_DATA bool8 gUnknown_203ABED = FALSE; static EWRAM_DATA bool8 sAllocedBg0TilemapBuffer = FALSE;
static void sub_80F83D0(u8 taskId); static void Task_RunMapPreviewScreenForest(u8 taskId);
static const u8 gViridianForestMapPreviewPalette[] = INCBIN_U8("data/map_preview/viridian_forest_pal.gbapal"); static const u8 gViridianForestMapPreviewPalette[] = INCBIN_U8("data/map_preview/viridian_forest_pal.gbapal");
static const u8 gViridianForestMapPreviewTiles[] = INCBIN_U8("data/map_preview/viridian_forest_tiles.4bpp.lz"); static const u8 gViridianForestMapPreviewTiles[] = INCBIN_U8("data/map_preview/viridian_forest_tiles.4bpp.lz");
@@ -88,7 +88,7 @@ static const u8 gAlteringCaveMapPreviewTilemap[] = INCBIN_U8("data/map_preview/a
static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = { static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
[MPS_VIRIDIAN_FOREST] = { [MPS_VIRIDIAN_FOREST] = {
.mapsec = MAPSEC_VIRIDIAN_FOREST, .mapsec = MAPSEC_VIRIDIAN_FOREST,
.forceFirstTime = TRUE, .type = TRUE,
.flagId = FLAG_WORLD_MAP_VIRIDIAN_FOREST, .flagId = FLAG_WORLD_MAP_VIRIDIAN_FOREST,
.tilesptr = gViridianForestMapPreviewTiles, .tilesptr = gViridianForestMapPreviewTiles,
.tilemapptr = gViridianForestMapPreviewTilemap, .tilemapptr = gViridianForestMapPreviewTilemap,
@@ -96,7 +96,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_MT_MOON] = { [MPS_MT_MOON] = {
.mapsec = MAPSEC_MT_MOON, .mapsec = MAPSEC_MT_MOON,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_MT_MOON_1F, .flagId = FLAG_WORLD_MAP_MT_MOON_1F,
.tilesptr = gMtMoonMapPreviewTiles, .tilesptr = gMtMoonMapPreviewTiles,
.tilemapptr = gMtMoonMapPreviewTilemap, .tilemapptr = gMtMoonMapPreviewTilemap,
@@ -104,7 +104,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_DIGLETTS_CAVE] = { [MPS_DIGLETTS_CAVE] = {
.mapsec = MAPSEC_DIGLETTS_CAVE, .mapsec = MAPSEC_DIGLETTS_CAVE,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F, .flagId = FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F,
.tilesptr = gDiglettsCaveMapPreviewTiles, .tilesptr = gDiglettsCaveMapPreviewTiles,
.tilemapptr = gDiglettsCaveMapPreviewTilemap, .tilemapptr = gDiglettsCaveMapPreviewTilemap,
@@ -112,7 +112,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_ROCK_TUNNEL] = { [MPS_ROCK_TUNNEL] = {
.mapsec = MAPSEC_ROCK_TUNNEL, .mapsec = MAPSEC_ROCK_TUNNEL,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_ROCK_TUNNEL_1F, .flagId = FLAG_WORLD_MAP_ROCK_TUNNEL_1F,
.tilesptr = gRockTunnelMapPreviewTiles, .tilesptr = gRockTunnelMapPreviewTiles,
.tilemapptr = gRockTunnelMapPreviewTilemap, .tilemapptr = gRockTunnelMapPreviewTilemap,
@@ -120,7 +120,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_POKEMON_TOWER] = { [MPS_POKEMON_TOWER] = {
.mapsec = MAPSEC_POKEMON_TOWER, .mapsec = MAPSEC_POKEMON_TOWER,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_POKEMON_TOWER_1F, .flagId = FLAG_WORLD_MAP_POKEMON_TOWER_1F,
.tilesptr = gPokemonTowerMapPreviewTiles, .tilesptr = gPokemonTowerMapPreviewTiles,
.tilemapptr = gPokemonTowerMapPreviewTilemap, .tilemapptr = gPokemonTowerMapPreviewTilemap,
@@ -128,7 +128,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_SAFARI_ZONE] = { [MPS_SAFARI_ZONE] = {
.mapsec = MAPSEC_KANTO_SAFARI_ZONE, .mapsec = MAPSEC_KANTO_SAFARI_ZONE,
.forceFirstTime = TRUE, .type = TRUE,
.flagId = FLAG_WORLD_MAP_SAFARI_ZONE_CENTER, .flagId = FLAG_WORLD_MAP_SAFARI_ZONE_CENTER,
.tilesptr = gKantoSafariZoneMapPreviewTiles, .tilesptr = gKantoSafariZoneMapPreviewTiles,
.tilemapptr = gKantoSafariZoneMapPreviewTilemap, .tilemapptr = gKantoSafariZoneMapPreviewTilemap,
@@ -136,7 +136,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_SEAFOAM_ISLANDS] = { [MPS_SEAFOAM_ISLANDS] = {
.mapsec = MAPSEC_SEAFOAM_ISLANDS, .mapsec = MAPSEC_SEAFOAM_ISLANDS,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_SEAFOAM_ISLANDS_1F, .flagId = FLAG_WORLD_MAP_SEAFOAM_ISLANDS_1F,
.tilesptr = gSeafoamIslandsMapPreviewTiles, .tilesptr = gSeafoamIslandsMapPreviewTiles,
.tilemapptr = gSeafoamIslandsMapPreviewTilemap, .tilemapptr = gSeafoamIslandsMapPreviewTilemap,
@@ -144,7 +144,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_POKEMON_MANSION] = { [MPS_POKEMON_MANSION] = {
.mapsec = MAPSEC_POKEMON_MANSION, .mapsec = MAPSEC_POKEMON_MANSION,
.forceFirstTime = TRUE, .type = TRUE,
.flagId = FLAG_WORLD_MAP_POKEMON_MANSION_1F, .flagId = FLAG_WORLD_MAP_POKEMON_MANSION_1F,
.tilesptr = gPokemonMansionMapPreviewTiles, .tilesptr = gPokemonMansionMapPreviewTiles,
.tilemapptr = gPokemonMansionMapPreviewTilemap, .tilemapptr = gPokemonMansionMapPreviewTilemap,
@@ -152,7 +152,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_ROCKET_HIDEOUT] = { [MPS_ROCKET_HIDEOUT] = {
.mapsec = MAPSEC_ROCKET_HIDEOUT, .mapsec = MAPSEC_ROCKET_HIDEOUT,
.forceFirstTime = TRUE, .type = TRUE,
.flagId = FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F, .flagId = FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F,
.tilesptr = gRocketHideoutMapPreviewTiles, .tilesptr = gRocketHideoutMapPreviewTiles,
.tilemapptr = gRocketHideoutMapPreviewTilemap, .tilemapptr = gRocketHideoutMapPreviewTilemap,
@@ -160,7 +160,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_SILPH_CO] = { [MPS_SILPH_CO] = {
.mapsec = MAPSEC_SILPH_CO, .mapsec = MAPSEC_SILPH_CO,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_SILPH_CO_1F, .flagId = FLAG_WORLD_MAP_SILPH_CO_1F,
.tilesptr = gSilphCoMapPreviewTiles, .tilesptr = gSilphCoMapPreviewTiles,
.tilemapptr = gSilphCoMapPreviewTilemap, .tilemapptr = gSilphCoMapPreviewTilemap,
@@ -168,7 +168,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_VICTORY_ROAD] = { [MPS_VICTORY_ROAD] = {
.mapsec = MAPSEC_KANTO_VICTORY_ROAD, .mapsec = MAPSEC_KANTO_VICTORY_ROAD,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_VICTORY_ROAD_1F, .flagId = FLAG_WORLD_MAP_VICTORY_ROAD_1F,
.tilesptr = gKantoVictoryRoadMapPreviewTiles, .tilesptr = gKantoVictoryRoadMapPreviewTiles,
.tilemapptr = gKantoVictoryRoadMapPreviewTilemap, .tilemapptr = gKantoVictoryRoadMapPreviewTilemap,
@@ -176,7 +176,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_CERULEAN_CAVE] = { [MPS_CERULEAN_CAVE] = {
.mapsec = MAPSEC_CERULEAN_CAVE, .mapsec = MAPSEC_CERULEAN_CAVE,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_CERULEAN_CAVE_1F, .flagId = FLAG_WORLD_MAP_CERULEAN_CAVE_1F,
.tilesptr = gCeruleanCaveMapPreviewTiles, .tilesptr = gCeruleanCaveMapPreviewTiles,
.tilemapptr = gCeruleanCaveMapPreviewTilemap, .tilemapptr = gCeruleanCaveMapPreviewTilemap,
@@ -184,7 +184,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_POWER_PLANT] = { [MPS_POWER_PLANT] = {
.mapsec = MAPSEC_POWER_PLANT, .mapsec = MAPSEC_POWER_PLANT,
.forceFirstTime = TRUE, .type = TRUE,
.flagId = FLAG_WORLD_MAP_POWER_PLANT, .flagId = FLAG_WORLD_MAP_POWER_PLANT,
.tilesptr = gPowerPlantMapPreviewTiles, .tilesptr = gPowerPlantMapPreviewTiles,
.tilemapptr = gPowerPlantMapPreviewTilemap, .tilemapptr = gPowerPlantMapPreviewTilemap,
@@ -192,7 +192,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_MT_EMBER] = { [MPS_MT_EMBER] = {
.mapsec = MAPSEC_MT_EMBER, .mapsec = MAPSEC_MT_EMBER,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_MT_EMBER_EXTERIOR, .flagId = FLAG_WORLD_MAP_MT_EMBER_EXTERIOR,
.tilesptr = gMtEmberMapPreviewTiles, .tilesptr = gMtEmberMapPreviewTiles,
.tilemapptr = gMtEmberMapPreviewTilemap, .tilemapptr = gMtEmberMapPreviewTilemap,
@@ -200,7 +200,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_ROCKET_WAREHOUSE] = { [MPS_ROCKET_WAREHOUSE] = {
.mapsec = MAPSEC_ROCKET_WAREHOUSE, .mapsec = MAPSEC_ROCKET_WAREHOUSE,
.forceFirstTime = TRUE, .type = TRUE,
.flagId = FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST, .flagId = FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST,
.tilesptr = gRocketWarehouseMapPreviewTiles, .tilesptr = gRocketWarehouseMapPreviewTiles,
.tilemapptr = gRocketWarehouseMapPreviewTilemap, .tilemapptr = gRocketWarehouseMapPreviewTilemap,
@@ -208,7 +208,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_MONEAN_CHAMBER] = { [MPS_MONEAN_CHAMBER] = {
.mapsec = MAPSEC_MONEAN_CHAMBER, .mapsec = MAPSEC_MONEAN_CHAMBER,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER, .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
.tilesptr = gMoneanChamberMapPreviewTiles, .tilesptr = gMoneanChamberMapPreviewTiles,
.tilemapptr = gMoneanChamberMapPreviewTilemap, .tilemapptr = gMoneanChamberMapPreviewTilemap,
@@ -216,7 +216,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_DOTTED_HOLE] = { [MPS_DOTTED_HOLE] = {
.mapsec = MAPSEC_DOTTED_HOLE, .mapsec = MAPSEC_DOTTED_HOLE,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F, .flagId = FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F,
.tilesptr = gDottedHoleMapPreviewTiles, .tilesptr = gDottedHoleMapPreviewTiles,
.tilemapptr = gDottedHoleMapPreviewTilemap, .tilemapptr = gDottedHoleMapPreviewTilemap,
@@ -224,7 +224,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_BERRY_FOREST] = { [MPS_BERRY_FOREST] = {
.mapsec = MAPSEC_BERRY_FOREST, .mapsec = MAPSEC_BERRY_FOREST,
.forceFirstTime = TRUE, .type = TRUE,
.flagId = FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST, .flagId = FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST,
.tilesptr = gBerryForestMapPreviewTiles, .tilesptr = gBerryForestMapPreviewTiles,
.tilemapptr = gBerryForestMapPreviewTilemap, .tilemapptr = gBerryForestMapPreviewTilemap,
@@ -232,7 +232,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_ICEFALL_CAVE] = { [MPS_ICEFALL_CAVE] = {
.mapsec = MAPSEC_ICEFALL_CAVE, .mapsec = MAPSEC_ICEFALL_CAVE,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE, .flagId = FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE,
.tilesptr = gIcefallCaveMapPreviewTiles, .tilesptr = gIcefallCaveMapPreviewTiles,
.tilemapptr = gIcefallCaveMapPreviewTilemap, .tilemapptr = gIcefallCaveMapPreviewTilemap,
@@ -240,7 +240,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_LOST_CAVE] = { [MPS_LOST_CAVE] = {
.mapsec = MAPSEC_LOST_CAVE, .mapsec = MAPSEC_LOST_CAVE,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE, .flagId = FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE,
.tilesptr = gLostCaveMapPreviewTiles, .tilesptr = gLostCaveMapPreviewTiles,
.tilemapptr = gLostCaveMapPreviewTilemap, .tilemapptr = gLostCaveMapPreviewTilemap,
@@ -248,7 +248,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_ALTERING_CAVE] = { [MPS_ALTERING_CAVE] = {
.mapsec = MAPSEC_ALTERING_CAVE, .mapsec = MAPSEC_ALTERING_CAVE,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE, .flagId = FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE,
.tilesptr = gAlteringCaveMapPreviewTiles, .tilesptr = gAlteringCaveMapPreviewTiles,
.tilemapptr = gAlteringCaveMapPreviewTilemap, .tilemapptr = gAlteringCaveMapPreviewTilemap,
@@ -256,7 +256,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_PATTERN_BUSH] = { [MPS_PATTERN_BUSH] = {
.mapsec = MAPSEC_PATTERN_BUSH, .mapsec = MAPSEC_PATTERN_BUSH,
.forceFirstTime = TRUE, .type = TRUE,
.flagId = FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH, .flagId = FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH,
.tilesptr = gViridianForestMapPreviewTiles, .tilesptr = gViridianForestMapPreviewTiles,
.tilemapptr = gViridianForestMapPreviewTilemap, .tilemapptr = gViridianForestMapPreviewTilemap,
@@ -264,7 +264,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_LIPTOO_CHAMBER] = { [MPS_LIPTOO_CHAMBER] = {
.mapsec = MAPSEC_LIPTOO_CHAMBER, .mapsec = MAPSEC_LIPTOO_CHAMBER,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER, .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
.tilesptr = gMoneanChamberMapPreviewTiles, .tilesptr = gMoneanChamberMapPreviewTiles,
.tilemapptr = gMoneanChamberMapPreviewTilemap, .tilemapptr = gMoneanChamberMapPreviewTilemap,
@@ -272,7 +272,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_WEEPTH_CHAMBER] = { [MPS_WEEPTH_CHAMBER] = {
.mapsec = MAPSEC_WEEPTH_CHAMBER, .mapsec = MAPSEC_WEEPTH_CHAMBER,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER, .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
.tilesptr = gMoneanChamberMapPreviewTiles, .tilesptr = gMoneanChamberMapPreviewTiles,
.tilemapptr = gMoneanChamberMapPreviewTilemap, .tilemapptr = gMoneanChamberMapPreviewTilemap,
@@ -280,7 +280,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_TDILFORD_CHAMBER] = { [MPS_TDILFORD_CHAMBER] = {
.mapsec = MAPSEC_DILFORD_CHAMBER, .mapsec = MAPSEC_DILFORD_CHAMBER,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER, .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
.tilesptr = gMoneanChamberMapPreviewTiles, .tilesptr = gMoneanChamberMapPreviewTiles,
.tilemapptr = gMoneanChamberMapPreviewTilemap, .tilemapptr = gMoneanChamberMapPreviewTilemap,
@@ -288,7 +288,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_SCUFIB_CHAMBER] = { [MPS_SCUFIB_CHAMBER] = {
.mapsec = MAPSEC_SCUFIB_CHAMBER, .mapsec = MAPSEC_SCUFIB_CHAMBER,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER, .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
.tilesptr = gMoneanChamberMapPreviewTiles, .tilesptr = gMoneanChamberMapPreviewTiles,
.tilemapptr = gMoneanChamberMapPreviewTilemap, .tilemapptr = gMoneanChamberMapPreviewTilemap,
@@ -296,7 +296,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_RIXY_CHAMBER] = { [MPS_RIXY_CHAMBER] = {
.mapsec = MAPSEC_RIXY_CHAMBER, .mapsec = MAPSEC_RIXY_CHAMBER,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER, .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
.tilesptr = gMoneanChamberMapPreviewTiles, .tilesptr = gMoneanChamberMapPreviewTiles,
.tilemapptr = gMoneanChamberMapPreviewTilemap, .tilemapptr = gMoneanChamberMapPreviewTilemap,
@@ -304,7 +304,7 @@ static const struct MapPreviewScreen sMapPreviewScreenData[MPS_COUNT] = {
}, },
[MPS_VIAPOIS_CHAMBER] = { [MPS_VIAPOIS_CHAMBER] = {
.mapsec = MAPSEC_VIAPOIS_CHAMBER, .mapsec = MAPSEC_VIAPOIS_CHAMBER,
.forceFirstTime = FALSE, .type = FALSE,
.flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER, .flagId = FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER,
.tilesptr = gMoneanChamberMapPreviewTiles, .tilesptr = gMoneanChamberMapPreviewTiles,
.tilemapptr = gMoneanChamberMapPreviewTilemap, .tilemapptr = gMoneanChamberMapPreviewTilemap,
@@ -328,7 +328,7 @@ static const struct BgTemplate sMapPreviewBgTemplate[1] = {
} }
}; };
static u8 sub_80F80E4(u8 mapsec) static u8 GetMapPreviewScreenIdx(u8 mapsec)
{ {
s32 i; s32 i;
@@ -342,20 +342,20 @@ static u8 sub_80F80E4(u8 mapsec)
return MPS_COUNT; return MPS_COUNT;
} }
bool8 sub_80F8110(u8 mapsec, u8 forceFirstTime) bool8 MapHasPreviewScreen(u8 mapsec, u8 type)
{ {
u8 idx; u8 idx;
idx = sub_80F80E4(mapsec); idx = GetMapPreviewScreenIdx(mapsec);
if (idx != MPS_COUNT) if (idx != MPS_COUNT)
{ {
if (forceFirstTime == 2) if (type == 2)
{ {
return TRUE; return TRUE;
} }
else else
{ {
return sMapPreviewScreenData[idx].forceFirstTime == forceFirstTime ? TRUE : FALSE; return sMapPreviewScreenData[idx].type == type ? TRUE : FALSE;
} }
} }
else else
@@ -364,29 +364,29 @@ bool8 sub_80F8110(u8 mapsec, u8 forceFirstTime)
} }
} }
bool32 sub_80F8154(u8 mapsec, u8 forceFirstTime) bool32 MapHasPreviewScreen_HandleQLState2(u8 mapsec, u8 type)
{ {
if (gQuestLogState == 2) if (gQuestLogState == QL_STATE_2)
{ {
return FALSE; return FALSE;
} }
else else
{ {
return sub_80F8110(mapsec, forceFirstTime); return MapHasPreviewScreen(mapsec, type);
} }
} }
void sub_80F8180(void) void MapPreview_InitBgs(void)
{ {
InitBgsFromTemplates(0, sMapPreviewBgTemplate, NELEMS(sMapPreviewBgTemplate)); InitBgsFromTemplates(0, sMapPreviewBgTemplate, NELEMS(sMapPreviewBgTemplate));
ShowBg(0); ShowBg(0);
} }
void sub_80F819C(u8 mapsec) void MapPreview_LoadGfx(u8 mapsec)
{ {
u8 idx; u8 idx;
idx = sub_80F80E4(mapsec); idx = GetMapPreviewScreenIdx(mapsec);
if (idx != MPS_COUNT) if (idx != MPS_COUNT)
{ {
ResetTempTileDataBuffers(); ResetTempTileDataBuffers();
@@ -395,55 +395,55 @@ void sub_80F819C(u8 mapsec)
if (GetBgTilemapBuffer(0) == NULL) if (GetBgTilemapBuffer(0) == NULL)
{ {
SetBgTilemapBuffer(0, Alloc(BG_SCREEN_SIZE)); SetBgTilemapBuffer(0, Alloc(BG_SCREEN_SIZE));
gUnknown_203ABED = TRUE; sAllocedBg0TilemapBuffer = TRUE;
} }
else else
{ {
gUnknown_203ABED = FALSE; sAllocedBg0TilemapBuffer = FALSE;
} }
CopyToBgTilemapBuffer(0, sMapPreviewScreenData[idx].tilemapptr, 0, 0x000); CopyToBgTilemapBuffer(0, sMapPreviewScreenData[idx].tilemapptr, 0, 0x000);
CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(0);
} }
} }
void sub_80F8234(s32 windowId) void MapPreview_Unload(s32 windowId)
{ {
RemoveWindow(windowId); RemoveWindow(windowId);
if (gUnknown_203ABED) if (sAllocedBg0TilemapBuffer)
{ {
Free(GetBgTilemapBuffer(0)); Free(GetBgTilemapBuffer(0));
} }
} }
bool32 sub_80F8258(void) bool32 MapPreview_IsGfxLoadFinished(void)
{ {
return FreeTempTileDataBuffersIfPossible(); return FreeTempTileDataBuffersIfPossible();
} }
void sub_80F8268(u8 mapsec) void MapPreview_StartForestTransition(u8 mapsec)
{ {
u8 taskId; u8 taskId;
taskId = CreateTask(sub_80F83D0, 0); taskId = CreateTask(Task_RunMapPreviewScreenForest, 0);
gTasks[taskId].data[2] = GetBgAttribute(0, BG_ATTR_PRIORITY); gTasks[taskId].data[2] = GetBgAttribute(0, BG_ATTR_PRIORITY);
gTasks[taskId].data[4] = GetGpuReg(REG_OFFSET_BLDCNT); gTasks[taskId].data[4] = GetGpuReg(REG_OFFSET_BLDCNT);
gTasks[taskId].data[5] = GetGpuReg(REG_OFFSET_BLDALPHA); gTasks[taskId].data[5] = GetGpuReg(REG_OFFSET_BLDALPHA);
gTasks[taskId].data[3] = GetGpuReg(REG_OFFSET_DISPCNT); gTasks[taskId].data[3] = GetGpuReg(REG_OFFSET_DISPCNT);
gTasks[taskId].data[6] = GetGpuReg(REG_OFFSET_WININ); gTasks[taskId].data[6] = GetGpuReg(REG_OFFSET_WININ);
gTasks[taskId].data[7] = GetGpuReg(REG_OFFSET_WINOUT); gTasks[taskId].data[7] = GetGpuReg(REG_OFFSET_WINOUT);
gTasks[taskId].data[10] = sub_80F856C(mapsec); gTasks[taskId].data[10] = MapPreview_GetDuration(mapsec);
gTasks[taskId].data[8] = 16; gTasks[taskId].data[8] = 16;
gTasks[taskId].data[9] = 0; gTasks[taskId].data[9] = 0;
SetBgAttribute(0, BG_ATTR_PRIORITY, 0); SetBgAttribute(0, BG_ATTR_PRIORITY, 0);
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD);
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0)); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0));
SetGpuRegBits(REG_OFFSET_WININ, 0x2020); SetGpuRegBits(REG_OFFSET_WININ, WININ_WIN0_CLR | WININ_WIN1_CLR);
SetGpuRegBits(REG_OFFSET_WINOUT, 0x0020); SetGpuRegBits(REG_OFFSET_WINOUT, WINOUT_WIN01_CLR);
gTasks[taskId].data[11] = sub_80F8318(mapsec); gTasks[taskId].data[11] = MapPreview_CreateMapNameWindow(mapsec);
ScriptContext2_Enable(); ScriptContext2_Enable();
} }
u16 sub_80F8318(u8 mapsec) u16 MapPreview_CreateMapNameWindow(u8 mapsec)
{ {
u16 windowId; u16 windowId;
u32 xctr; u32 xctr;
@@ -452,18 +452,18 @@ u16 sub_80F8318(u8 mapsec)
windowId = AddWindow(&sMapNameWindow); windowId = AddWindow(&sMapNameWindow);
FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
PutWindowTilemap(windowId); PutWindowTilemap(windowId);
color[0] = 1; // Access violation color[0] = TEXT_COLOR_WHITE; // Access violation
color[1] = 4; // Access violation color[1] = TEXT_COLOR_RED; // Access violation
color[2] = 3; // Access violation color[2] = TEXT_COLOR_LIGHT_GREY; // Access violation
GetMapName(gStringVar4, mapsec, 0); GetMapName(gStringVar4, mapsec, 0);
xctr = 104 - GetStringWidth(2, gStringVar4, 0); xctr = 104 - GetStringWidth(2, gStringVar4, 0);
AddTextPrinterParameterized4(windowId, 2, xctr / 2, 2, 0, 0, color/* Access violation */, -1, gStringVar4); AddTextPrinterParameterized4(windowId, 2, xctr / 2, 2, 0, 0, color/* Access violation */, -1, gStringVar4);
return windowId; return windowId;
} }
bool32 sub_80F83B0(void) bool32 ForestMapPreviewScreenIsRunning(void)
{ {
if (FuncIsActiveTask(sub_80F83D0) == TRUE) if (FuncIsActiveTask(Task_RunMapPreviewScreenForest) == TRUE)
{ {
return FALSE; return FALSE;
} }
@@ -473,7 +473,7 @@ bool32 sub_80F83B0(void)
} }
} }
static void sub_80F83D0(u8 taskId) static void Task_RunMapPreviewScreenForest(u8 taskId)
{ {
s16 * data; s16 * data;
@@ -481,7 +481,7 @@ static void sub_80F83D0(u8 taskId)
switch (data[0]) switch (data[0])
{ {
case 0: case 0:
if (!sub_80F8258() && !IsDma3ManagerBusyWithBgCopy()) if (!MapPreview_IsGfxLoadFinished() && !IsDma3ManagerBusyWithBgCopy())
{ {
CopyWindowToVram(data[11], 3); CopyWindowToVram(data[11], 3);
data[0]++; data[0]++;
@@ -539,7 +539,7 @@ static void sub_80F83D0(u8 taskId)
case 5: case 5:
if (!IsDma3ManagerBusyWithBgCopy()) if (!IsDma3ManagerBusyWithBgCopy())
{ {
sub_80F8234(data[11]); MapPreview_Unload(data[11]);
SetBgAttribute(0, BG_ATTR_PRIORITY, data[2]); SetBgAttribute(0, BG_ATTR_PRIORITY, data[2]);
SetGpuReg(REG_OFFSET_DISPCNT, data[3]); SetGpuReg(REG_OFFSET_DISPCNT, data[3]);
SetGpuReg(REG_OFFSET_BLDCNT, data[4]); SetGpuReg(REG_OFFSET_BLDCNT, data[4]);
@@ -556,7 +556,7 @@ const struct MapPreviewScreen * GetDungeonMapPreviewScreenInfo(u8 mapsec)
{ {
u8 idx; u8 idx;
idx = sub_80F80E4(mapsec); idx = GetMapPreviewScreenIdx(mapsec);
if (idx == MPS_COUNT) if (idx == MPS_COUNT)
{ {
return NULL; return NULL;
@@ -567,18 +567,18 @@ const struct MapPreviewScreen * GetDungeonMapPreviewScreenInfo(u8 mapsec)
} }
} }
u16 sub_80F856C(u8 mapsec) u16 MapPreview_GetDuration(u8 mapsec)
{ {
u8 idx; u8 idx;
u16 flagId; u16 flagId;
idx = sub_80F80E4(mapsec); idx = GetMapPreviewScreenIdx(mapsec);
if (idx == MPS_COUNT) if (idx == MPS_COUNT)
{ {
return 0; return 0;
} }
flagId = sMapPreviewScreenData[idx].flagId; flagId = sMapPreviewScreenData[idx].flagId;
if (!sMapPreviewScreenData[idx].forceFirstTime) if (sMapPreviewScreenData[idx].type == 0)
{ {
if (!FlagGet(flagId)) if (!FlagGet(flagId))
{ {
@@ -590,7 +590,7 @@ u16 sub_80F856C(u8 mapsec)
} }
} }
else { else {
if (gUnknown_203ABEC) if (sHasVisitedMapBefore)
{ {
return 120; return 120;
} }
@@ -601,15 +601,15 @@ u16 sub_80F856C(u8 mapsec)
} }
} }
void sub_80F85BC(u16 flagId) void MapPreview_SetFlag(u16 flagId)
{ {
if (!FlagGet(flagId)) if (!FlagGet(flagId))
{ {
gUnknown_203ABEC = TRUE; sHasVisitedMapBefore = TRUE;
} }
else else
{ {
gUnknown_203ABEC = FALSE; sHasVisitedMapBefore = FALSE;
} }
FlagSet(flagId); FlagSet(flagId);
} }
src/quest_log.c
+1 -1
View File
@@ -4294,7 +4294,7 @@ static const u16 sQuestLogWorldMapFlags[] =
FLAG_WORLD_MAP_SIX_ISLAND FLAG_WORLD_MAP_SIX_ISLAND
}; };
void sub_8115748(u16 worldMapFlag) void QuestLog_RecordEnteredMap(u16 worldMapFlag)
{ {
s32 i; s32 i;
src/scrcmd.c
+2 -2
View File
@@ -598,8 +598,8 @@ bool8 ScrCmd_comparestattoword(struct ScriptContext * ctx)
bool8 ScrCmd_setworldmapflag(struct ScriptContext * ctx) bool8 ScrCmd_setworldmapflag(struct ScriptContext * ctx)
{ {
u16 value = ScriptReadHalfword(ctx); u16 value = ScriptReadHalfword(ctx);
sub_8115748(value); QuestLog_RecordEnteredMap(value);
sub_80F85BC(value); MapPreview_SetFlag(value);
return FALSE; return FALSE;
} }