Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-25 15:49:02 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Document ov5_021D1744 -> FieldMap_FadeScreen

Browse Source
This commit is contained in:
Rachel 2025-08-31 19:59:27 -07:00
parent 9bfa03c540
commit ffee2b6df5
12 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/overlay005/fieldmap.h
View File

@ -13,6 +13,6 @@ void ov5_021D1434(BgConfig *param0);
void ov5_021D143C(BgConfig *param0);
void ov5_021D16F4(FieldSystem *fieldSystem, BOOL param1);
void ov5_021D1718(FieldSystem *fieldSystem, BOOL param1);
void ov5_021D1744(const u8 param0);
void FieldMap_FadeScreen(const u8 fadeInOrOut);
#endif // POKEPLATINUM_OV5_021D0D80_H

4
src/item_use_functions.c
View File

@ -1124,7 +1124,7 @@ static BOOL RegisteredItem_GoToApp(FieldTask *task)
switch (v1->unk_2A) {
case 0:
MapObjectMan_PauseAllMovement(fieldSystem->mapObjMan);
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
v1->unk_2A = 1;
break;
case 1:
@ -1152,7 +1152,7 @@ static BOOL RegisteredItem_GoToApp(FieldTask *task)
case 3:
if (FieldSystem_IsRunningFieldMap(fieldSystem)) {
MapObjectMan_PauseAllMovement(fieldSystem->mapObjMan);
ov5_021D1744(1);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_IN);
v1->unk_2A = 4;
}
break;

6
src/overlay005/fieldmap.c
View File

@ -759,11 +759,11 @@ static void ov5_021D173C(FieldSystem *fieldSystem)
fieldSystem->unk_C0 = (8 | 1 | 2 | 4);
}
void ov5_021D1744(const u8 param0)
void FieldMap_FadeScreen(const u8 fadeInOrOut)
{
if (param0 == 1) {
if (fadeInOrOut == FADE_TYPE_BRIGHTNESS_IN) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
} else if (param0 == 0) {
} else if (fadeInOrOut == FADE_TYPE_BRIGHTNESS_OUT) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
} else {
GF_ASSERT(FALSE);

6
src/overlay005/ov5_021D431C.c
View File

@ -279,7 +279,7 @@ BOOL ov5_021D453C(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1)
} else {
GF_ASSERT(FALSE);
ov5_021D1744(1);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_IN);
(param1->unk_00) = 6;
return 0;
}
@ -523,7 +523,7 @@ BOOL ov5_021D4858(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1, cons
(param1->unk_00)++;
} break;
case 1:
ov5_021D1744(1);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_IN);
MapPropOneShotAnimationManager_PlayAnimationWithSoundEffect(fieldSystem->mapPropOneShotAnimMan, 2, 0, 1557);
v0 = Player_MapObject(fieldSystem->playerAvatar);
@ -665,7 +665,7 @@ BOOL ov5_021D4A24(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1, cons
if (LocalMapObj_IsAnimationSet(v0) == 1) {
LocalMapObj_SetAnimationCode(v0, MOVEMENT_ACTION_RESUME_ANIMATION);
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
(param1->unk_00)++;
}
break;

2
src/overlay007/shop_menu.c
View File

@ -1598,7 +1598,7 @@ static void Shop_SetCursorSpritePalette(ShopMenu *shopMenu, u8 selected)
static void Shop_StartScreenFade(FieldSystem *fieldSystem, ShopMenu *shopMenu)
{
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
shopMenu->state = SHOP_STATE_WAIT_SCREEN_TRANSITION;
}

5
src/shop_misc.c
View File

@ -1,7 +1,6 @@
#include "shop_misc.h"
#include <nitro.h>
#include <string.h>
#include "generated/fade_types.h"
#include "field/field_system.h"
#include "overlay005/fieldmap.h"
@ -51,7 +50,7 @@ static void ShopMisc_ReinitShop(FieldTask *task)
ShopMenu *shopMenu = FieldTask_GetEnv(task);
if (FieldSystem_IsRunningFieldMap(fieldSystem)) {
ov5_021D1744(1);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_IN);
FieldTask_InitJump(task, FieldTask_InitShop, shopMenu);
shopMenu->state = SHOP_STATE_REINIT_MERCHANT_MESSAGE;
}

18
src/start_menu.c
View File

@ -464,13 +464,13 @@ static BOOL sub_0203AC44(FieldTask *taskMan)
MapObjectMan_PauseAllMovement(fieldSystem->mapObjMan);
sub_0203ADFC(taskMan);
sub_0203B094(taskMan);
ov5_021D1744(1);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_IN);
menu->state = START_MENU_STATE_14;
}
break;
case START_MENU_STATE_8:
if (FieldSystem_IsRunningFieldMap(fieldSystem)) {
ov5_021D1744(1);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_IN);
menu->state = START_MENU_STATE_9;
}
break;
@ -485,7 +485,7 @@ static BOOL sub_0203AC44(FieldTask *taskMan)
case START_MENU_STATE_10:
if (FieldSystem_IsRunningFieldMap(fieldSystem)) {
MapObjectMan_PauseAllMovement(fieldSystem->mapObjMan);
ov5_021D1744(1);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_IN);
menu->state = START_MENU_STATE_11;
}
break;
@ -932,7 +932,7 @@ static BOOL StartMenu_SelectPokedex(FieldTask *taskMan)
{
StartMenu *menu = FieldTask_GetEnv(taskMan);
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
menu->callback = StartMenu_OpenPokedex;
menu->state = START_MENU_STATE_APP_START;
@ -986,7 +986,7 @@ static BOOL StartMenu_SelectPokemon(FieldTask *taskMan)
{
StartMenu *menu = FieldTask_GetEnv(taskMan);
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
menu->callback = sub_0203B78C;
menu->state = START_MENU_STATE_APP_START;
@ -1212,7 +1212,7 @@ static BOOL StartMenu_SelectBag(FieldTask *taskMan)
{
StartMenu *menu = FieldTask_GetEnv(taskMan);
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
menu->callback = StartMenu_Bag;
menu->state = START_MENU_STATE_APP_START;
@ -1337,7 +1337,7 @@ static BOOL StartMenu_SelectTrainerCard(FieldTask *taskMan)
{
StartMenu *menu = FieldTask_GetEnv(taskMan);
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
menu->callback = StartMenu_TrainerCard;
menu->state = START_MENU_STATE_APP_START;
@ -1430,7 +1430,7 @@ static BOOL StartMenu_SelectOptions(FieldTask *taskMan)
{
StartMenu *menu = FieldTask_GetEnv(taskMan);
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
menu->callback = StartMenu_Options;
menu->state = START_MENU_STATE_APP_START;
@ -1466,7 +1466,7 @@ static BOOL StartMenu_SelectChat(FieldTask *taskMan)
{
StartMenu *menu = FieldTask_GetEnv(taskMan);
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
menu->callback = sub_0203C0A0;
menu->state = START_MENU_STATE_APP_START;

4
src/unk_02056B30.c
View File

@ -366,7 +366,7 @@ static BOOL sub_02056F1C(FieldTask *taskMan)
break;
case 2:
Sound_PlayEffect(SEQ_SE_DP_KAIDAN2);
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
(v1->unk_04)++;
break;
case 3:
@ -542,7 +542,7 @@ static BOOL sub_02057218(FieldTask *taskMan)
switch (v1->unk_04) {
case 0:
ov5_021D1744(1);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_IN);
v2 = Player_MapObject(fieldSystem->playerAvatar);
if (1) {

10
src/unk_0205A0D8.c
View File

@ -226,7 +226,7 @@ static BOOL sub_0205A2B0(UnkStruct_0205A0D8 *param0, FieldSystem *fieldSystem)
static BOOL sub_0205A2DC(UnkStruct_0205A0D8 *param0)
{
if (FieldSystem_IsRunningFieldMap(param0->fieldSystem)) {
ov5_021D1744(1);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_IN);
CommPlayerMan_Restart();
return 1;
}
@ -342,7 +342,7 @@ static BOOL sub_0205A324(FieldTask *param0)
}
break;
case 13:
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
v0->unk_34 = 14;
break;
case 14:
@ -540,7 +540,7 @@ static BOOL sub_0205A324(FieldTask *param0)
CommTiming_StartSync(2);
v0->unk_34 = 39;
} else {
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
v0->unk_34 = 33;
}
break;
@ -1030,7 +1030,7 @@ static BOOL sub_0205B140(FieldTask *param0)
Strbuf_Free(v1->unk_04);
Window_EraseMessageBox(&v1->unk_08, 0);
Window_Remove(&v1->unk_08);
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
v1->unk_28++;
}
}
@ -1055,7 +1055,7 @@ static BOOL sub_0205B140(FieldTask *param0)
break;
case 6:
if (!FieldSystem_IsRunningFieldMap(fieldSystem)) {
ov5_021D1744(1);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_IN);
CommPlayerMan_Restart();
v1->unk_28++;
}

2
src/unk_020985E4.c
View File

@ -42,7 +42,7 @@ BOOL sub_0209862C(FieldTask *param0)
switch (v1->unk_00) {
case 0:
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
v1->unk_00++;
case 1:
if (IsScreenFadeDone() == FALSE) {

4
src/unk_0209ACF4.c
View File

@ -163,7 +163,7 @@ static BOOL sub_0209AE14(FieldTask *param0)
break;
case 4:
if (sub_0209B100(v0)) {
ov5_021D1744(0);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT);
v0->unk_54 = 5;
}
break;
@ -184,7 +184,7 @@ static BOOL sub_0209AE14(FieldTask *param0)
break;
case 7:
if (FieldSystem_IsRunningFieldMap(v0->fieldSystem)) {
ov5_021D1744(1);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_IN);
v0->unk_54 = 8;
}
break;

2
src/unk_0209B344.c
View File

@ -79,7 +79,7 @@ static BOOL sub_0209B3C4(FieldTask *param0)
break;
case 2:
if (FieldSystem_IsRunningFieldMap(v0->fieldSystem)) {
ov5_021D1744(1);
FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_IN);
v0->unk_18 = 3;
}
break;