diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/field_fadetransition.c | 965 | ||||
| -rw-r--r-- | src/map_preview_screen.c | 2 |
2 files changed, 966 insertions, 1 deletions
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c new file mode 100644 index 000000000..b8ed41c06 --- /dev/null +++ b/src/field_fadetransition.c @@ -0,0 +1,965 @@ +#include "global.h" +#include "palette.h" +#include "field_fadetransition.h" +#include "overworld.h" +#include "fldeff.h" +#include "field_weather.h" +#include "map_preview_screen.h" +#include "field_player_avatar.h" +#include "task.h" +#include "script.h" +#include "cable_club.h" +#include "fieldmap.h" +#include "metatile_behavior.h" +#include "quest_log.h" +#include "link.h" +#include "map_obj_80688E4.h" +#include "sound.h" +#include "field_door.h" +#include "field_effect.h" +#include "field_screen_effect.h" +#include "field_map_obj.h" +#include "field_map_obj_helpers.h" +#include "field_specials.h" +#include "map_obj_lock.h" +#include "start_menu.h" +#include "constants/songs.h" + +static void sub_807DF4C(u8 a0); +static void sub_807DFBC(u8 taskId); +static void task_map_chg_seq_0807E20C(u8 taskId); +static void task_map_chg_seq_0807E2CC(u8 taskId); +static void sub_807E31C(u8 taskId); +static void sub_807E718(u8 taskId); +static void sub_807E784(u8 taskId); +static void sub_807E80C(u8 taskId); +static void sub_807E980(u8 taskId); +static void sub_807EB64(u16, s16*, s16*); +static void sub_807EBBC(u8 a0, s16 *a1, s16 *a2); +static void sub_807EAC4(s16, s16, s16*, s16*, s16*); +static void sub_807EC34(u8 taskId); +static void sub_807ECBC(s16 *, s16 *, s16 *, s16 *, s16 *); +static bool8 sub_807EDA0(s16 *, s16 *, s16 *, s16 *, s16 *); + +void palette_bg_faded_fill_white(void) +{ + CpuFastFill16(RGB_WHITE, gPlttBufferFaded, 0x400); +} + +void palette_bg_faded_fill_black(void) +{ + CpuFastFill16(RGB_BLACK, gPlttBufferFaded, 0x400); +} + +void pal_fill_for_maplights(void) +{ + switch (sub_80C9DCC(get_map_light_from_warp0(), GetCurrentMapType())) + { + case 0: + palette_bg_faded_fill_black(); + fade_screen(0, 0); + palette_bg_faded_fill_black(); + break; + case 1: + palette_bg_faded_fill_white(); + fade_screen(2, 0); + palette_bg_faded_fill_white(); + break; + } +} + +static void sub_807DBAC(void) +{ + switch (sub_80C9DCC(get_map_light_from_warp0(), GetCurrentMapType())) + { + case 0: + palette_bg_faded_fill_black(); + fade_screen(0, 3); + palette_bg_faded_fill_black(); + break; + case 1: + palette_bg_faded_fill_white(); + fade_screen(2, 3); + palette_bg_faded_fill_white(); + break; + } +} + +void sub_807DC00(void) +{ + palette_bg_faded_fill_black(); + fade_screen(0, 0); + palette_bg_faded_fill_black(); +} + +void sub_807DC18(void) +{ + const struct MapHeader *header = warp1_get_mapheader(); + if (header->regionMapSectionId != gMapHeader.regionMapSectionId && sub_80F8110(header->regionMapSectionId, FALSE)) + fade_screen(1, 0); + else + { + switch (sub_80C9D7C(GetCurrentMapType(), header->mapType)) + { + case 0: + fade_screen(1, 0); + break; + case 1: + fade_screen(3, 0); + break; + } + } +} + +static void sub_807DC70(void) +{ + switch (sub_80C9D7C(GetCurrentMapType(), warp1_get_mapheader()->mapType)) + { + case 0: + fade_screen(1, 3); + break; + case 1: + fade_screen(3, 3); + break; + } +} + +static void sub_807DCB0(bool8 arg) +{ + sub_805CB04(!arg); +} + +static void task0A_nop_for_a_while(u8 taskId) +{ + if (sub_807E418() == TRUE) + DestroyTask(taskId); +} + +void sub_807DCE4(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + sub_807DC00(); + CreateTask(task0A_nop_for_a_while, 10); +} + +static void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskId) +{ + if (sub_807E418() == TRUE) + { + DestroyTask(taskId); + EnableBothScriptContexts(); + } +} + +void FieldCallback_ReturnToEventScript2(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + sub_807DC00(); + CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); +} + +void sub_807DD44(void) +{ + ScriptContext2_Enable(); + sub_807DC00(); + CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); +} + +static void task_mpl_807DD60(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + switch (task->data[0]) + { + case 0: + task->data[1] = sub_8081150(); + task->data[0]++; + break; + case 1: + if (gTasks[task->data[1]].isActive != TRUE) + { + pal_fill_for_maplights(); + task->data[0]++; + } + break; + case 2: + if (sub_807E418() == TRUE) + { + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_807DDD0(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + palette_bg_faded_fill_black(); + CreateTask(task_mpl_807DD60, 10); +} + +static void sub_807DDF0(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + switch (task->data[0]) + { + case 0: + sub_800AB9C(); + task->data[0]++; + break; + case 1: + if (IsLinkTaskFinished()) + { + pal_fill_for_maplights(); + task->data[0]++; + } + break; + case 2: + if (sub_807E418() == TRUE) + { + sub_8009FE8(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_807DE58(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + palette_bg_faded_fill_black(); + CreateTask(sub_807DDF0, 10); +} + +static void sub_807DE78(bool8 a0) +{ + s16 x, y; + u32 behavior; + TaskFunc func; + + PlayerGetDestCoords(&x, &y); + behavior = MapGridGetMetatileBehaviorAt(x, y); + if (MetatileBehavior_IsWarpDoor_2(behavior) == TRUE) + { + func = sub_807DFBC; + switch (sub_80C9DCC(get_map_light_from_warp0(), GetCurrentMapType())) + { + case 0: + palette_bg_faded_fill_black(); + break; + case 1: + palette_bg_faded_fill_white(); + break; + } + } + else + { + sub_807DF4C(a0); + if (MetatileBehavior_IsCaveDoor(behavior) == TRUE) + func = task_map_chg_seq_0807E20C; + else if (MetatileBehavior_IsUnknownWarp6C_to_6F(behavior) == TRUE) + { + u8 tmp = gUnknown_2031DE0; + func = task_map_chg_seq_0807E2CC; + if (!tmp) + func = sub_807EC34; + } + else + func = task_map_chg_seq_0807E2CC; + } + gUnknown_2031DE0 = FALSE; + CreateTask(func, 10); +} + +static void sub_807DF4C(bool8 a0) +{ + if (!a0) + pal_fill_for_maplights(); + else + sub_807DC00(); +} + +void sub_807DF64(void) +{ + Overworld_PlaySpecialMapMusic(); + sub_8111CF0(); + sub_807DE78(FALSE); + ScriptContext2_Enable(); +} + +void sub_807DF7C(void) +{ + Overworld_PlaySpecialMapMusic(); + sub_8111CF0(); + sub_807DE78(TRUE); + ScriptContext2_Enable(); +} + +static void sub_807DF94(void) +{ + Overworld_PlaySpecialMapMusic(); + pal_fill_for_maplights(); + sub_8111CF0(); + PlaySE(SE_RU_GASHIN); + CreateTask(sub_807E31C, 10); + ScriptContext2_Enable(); +} + +static void sub_807DFBC(u8 taskId) +{ + struct Task * task = &gTasks[taskId]; + s16 *x = &task->data[2]; + s16 *y = &task->data[3]; + + if (task->data[0] == 0) + task->data[0] = 5; + + switch (task->data[0]) + { + case 0: // Never reached + sub_807DCB0(0); + player_bitmagic(); + PlayerGetDestCoords(x, y); + FieldSetDoorOpened(*x, *y); + task->data[0] = 1; + break; + case 5: + sub_807DCB0(0); + player_bitmagic(); + sub_807F114(); + sub_807DBAC(); + task->data[0] = 6; + break; + case 6: + task->data[15]++; + if (task->data[15] == 25) + { + PlayerGetDestCoords(x, y); + PlaySE(GetDoorSoundEffect(*x, *y)); + FieldAnimateDoorOpen(*x, *y); + task->data[0] = 7; + } + break; + case 7: + if (!FieldIsDoorAnimationRunning()) + { + PlayerGetDestCoords(&task->data[12], &task->data[13]); + sub_807DCB0(TRUE); + FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], 16); + task->data[0] = 8; + } + break; + case 8: + task->data[14]++; + if (task->data[14] == 14) + { + FieldAnimateDoorClose(task->data[12], task->data[13]); + task->data[0] = 9; + } + break; + case 9: + if (sub_807E418() && walkrun_is_standing_still() && !FieldIsDoorAnimationRunning() && !FuncIsActiveTask(sub_807F204)) + { + FieldObjectClearHeldMovementIfFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + task->data[0] = 4; + } + break; + // Legacy RS + case 1: + if (sub_807E418()) + { + sub_807DCB0(TRUE); + FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], 16); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + task->data[1] = FieldAnimateDoorClose(*x, *y); + FieldObjectClearHeldMovementIfFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + task->data[0] = 3; + } + break; + case 3: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + task->data[0] = 4; + break; + case 4: + UnfreezeMapObjects(); + ScriptContext2_Disable(); + DestroyTask(taskId); + break; + } +} + +static void task_map_chg_seq_0807E20C(u8 taskId) +{ + struct Task * task = &gTasks[taskId]; + s16 *x = &task->data[2]; + s16 *y = &task->data[3]; + + switch (task->data[0]) + { + case 0: + sub_807DCB0(0); + player_bitmagic(); + PlayerGetDestCoords(x, y); + task->data[0] = 1; + break; + case 1: + if (sub_807E418()) + { + sub_807DCB0(TRUE); + FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], sub_8063F84(GetPlayerFacingDirection())); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + task->data[0] = 3; + } + break; + case 3: + UnfreezeMapObjects(); + ScriptContext2_Disable(); + DestroyTask(taskId); + break; + } +} + +static void task_map_chg_seq_0807E2CC(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + player_bitmagic(); + ScriptContext2_Enable(); + gTasks[taskId].data[0]++; + break; + case 1: + if (sub_807E418()) + { + UnfreezeMapObjects(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +static void sub_807E31C(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + player_bitmagic(); + ScriptContext2_Enable(); + sub_805DC04(); + gTasks[taskId].data[0]++; + break; + case 1: + if (sub_807E418() && sub_805DC24() != TRUE) + { + UnfreezeMapObjects(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +static void sub_807E378(u8 taskId) +{ + if (sub_807E418() == TRUE) + { + DestroyTask(taskId); + CreateTask(sub_806F1F0, 80); + } +} + +void sub_807E3A0(void) +{ + sub_807DC00(); + CreateTask(sub_807E378, 80); + ScriptContext2_Enable(); +} + +bool32 sub_807E3BC(void) +{ + sub_806F1D4(); + return FALSE; +} + +static void task_mpl_807E3C8(u8 taskId) +{ + if (sub_807E418() == TRUE) + { + ScriptContext2_Disable(); + DestroyTask(taskId); + sub_80696C0(); + } +} + +void sub_807E3EC(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + sub_807DC00(); + CreateTask(task_mpl_807E3C8, 10); +} + +static bool32 sub_807E40C(void) +{ + return gPaletteFade.active; +} + +bool32 sub_807E418(void) +{ + if (sub_807AA70() == TRUE && sub_80F83B0()) + return TRUE; + else + return FALSE; +} + +void DoWarp(void) +{ + ScriptContext2_Enable(); + sub_8055F88(); + sub_807DC18(); + PlayRainStoppingSoundEffect(); + PlaySE(SE_KAIDAN); + gFieldCallback = sub_807DF64; + CreateTask(sub_807E718, 10); +} + +void DoDiveWarp(void) +{ + ScriptContext2_Enable(); + sub_8055F88(); + sub_807DC18(); + PlayRainStoppingSoundEffect(); + gFieldCallback = sub_807DF64; + CreateTask(sub_807E718, 10); +} + +void sub_807E4A0(u16 a, u16 b) +{ + u8 taskId = CreateTask(sub_807E980, 10); + gTasks[taskId].data[1] = a; + gTasks[taskId].data[15] = b; + sub_807E980(taskId); +} + +void DoDoorWarp(void) +{ + ScriptContext2_Enable(); + gFieldCallback = sub_807DF64; + CreateTask(sub_807E80C, 10); +} + +void sub_807E500(void) +{ + ScriptContext2_Enable(); + CreateTask(sub_807E718, 10); + gFieldCallback = sub_807DF94; +} + +void sub_807E524(void) +{ + ScriptContext2_Enable(); + gFieldCallback = sub_807DF64; + CreateTask(sub_807E784, 10); +} + +void DoFallWarp(void) +{ + DoDiveWarp(); + gFieldCallback = sub_8084454; +} + +void sub_807E560(u8 a0) +{ + ScriptContext2_Enable(); + sub_8084784(a0, 10); +} + +void sub_807E57C(void) +{ + ScriptContext2_Enable(); + sub_8084F2C(10); +} + +void sub_807E58C(void) +{ + ScriptContext2_Enable(); + sub_80853CC(10); +} + +void sub_807E59C(void) +{ + ScriptContext2_Enable(); + sub_8055F88(); + CreateTask(sub_807E784, 10); + gFieldCallback = sub_807DF94; +} + +void sub_807E5C4(void) +{ + ScriptContext2_Enable(); + sub_807DC18(); + CreateTask(sub_807E718, 10); + gFieldCallback = nullsub_60; +} + +static void sub_807E5EC(u8 taskId) +{ + struct Task * task = &gTasks[taskId]; + switch (task->data[0]) + { + case 0: + ScriptContext2_Enable(); + task->data[0]++; + break; + case 1: + if (!sub_807E40C() && sub_8055FC4()) + task->data[0]++; + break; + case 2: + WarpIntoMap(); + SetMainCallback2(sub_8056788); + DestroyTask(taskId); + break; + } +} + +void sub_807E654(void) +{ + ScriptContext2_Enable(); + sub_8055F88(); + sub_807DC18(); + PlaySE(SE_KAIDAN); + CreateTask(sub_807E5EC, 10); +} + +static void sub_807E678(u8 taskId) +{ + s16 * data = gTasks[taskId].data; + switch (data[0]) + { + case 0: + sub_800A068(); + fade_screen(1, 0); + sub_8055F88(); + PlaySE(SE_KAIDAN); + data[0]++; + break; + case 1: + if (!sub_807E40C() && sub_8055FC4()) + { + sub_800AAC0(); + data[0]++; + } + break; + case 2: + if (gReceivedRemoteLinkPlayers == 0) + { + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + } + break; + } +} + +void sub_807E704(void) +{ + CreateTask(sub_807E678, 10); +} + +static void sub_807E718(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + switch (task->data[0]) + { + case 0: + player_bitmagic(); + ScriptContext2_Enable(); + task->data[0]++; + break; + case 1: + if (!sub_807E40C() && sub_8055FC4()) + task->data[0]++; + break; + case 2: + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + break; + } +} + +static void sub_807E784(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + switch (task->data[0]) + { + case 0: + player_bitmagic(); + ScriptContext2_Enable(); + PlaySE(SE_FU_ZUZUZU); + sub_805DAB0(); + task->data[0]++; + break; + case 1: + if (!sub_805DAD0()) + { + sub_807DC18(); + task->data[0]++; + } + break; + case 2: + if (!sub_807E40C() && sub_8055FC4()) + task->data[0]++; + break; + case 3: + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + break; + } +} + +static void sub_807E80C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + s16 * xp = &task->data[2]; + s16 * yp = &task->data[3]; + switch (task->data[0]) + { + case 0: + player_bitmagic(); + PlayerGetDestCoords(xp, yp); + PlaySE(GetDoorSoundEffect(*xp, *yp - 1)); + task->data[1] = FieldAnimateDoorOpen(*xp, *yp - 1); + task->data[0] = 1; + break; + case 1: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + { + FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], 17); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + task->data[1] = FieldAnimateDoorClose(*xp, *yp - 1); + FieldObjectClearHeldMovementIfFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + sub_807DCB0(FALSE); + task->data[0] = 3; + } + break; + case 3: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + { + task->data[0] = 4; + } + break; + case 4: + sub_8055F88(); + sub_807DC18(); + PlayRainStoppingSoundEffect(); + task->data[0] = 0; + task->func = sub_807E718; + break; + case 5: + sub_8055F88(); + PlayRainStoppingSoundEffect(); + task->data[0] = 0; + task->func = sub_807E718; + break; + } +} + +static void sub_807E980(u8 taskId) +{ + s16 * data = gTasks[taskId].data; + struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + struct Sprite *playerSpr = &gSprites[gPlayerAvatar.spriteId]; + switch (data[0]) + { + case 0: + ScriptContext2_Enable(); + player_bitmagic(); + CameraObjectReset2(); + data[0]++; + break; + case 1: + if (!FieldObjectIsMovementOverridden(playerObj) || FieldObjectClearHeldMovementIfFinished(playerObj)) + { + if (data[15] != 0) + data[15]--; + else + { + sub_8055F88(); + PlayRainStoppingSoundEffect(); + playerSpr->oam.priority = 1; + sub_807EB64(data[1], &data[2], &data[3]); + PlaySE(SE_KAIDAN); + data[0]++; + } + } + break; + case 2: + sub_807EAC4(data[2], data[3], &data[4], &data[5], &data[6]); + data[15]++; + if (data[15] >= 12) + { + sub_807DC18(); + data[0]++; + } + break; + case 3: + sub_807EAC4(data[2], data[3], &data[4], &data[5], &data[6]); + if (!sub_807E40C() && sub_8055FC4()) + data[0]++; + break; + default: + gFieldCallback = sub_807DF64; + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + break; + } +} + +static void sub_807EAC4(s16 a0, s16 a1, s16 *a2, s16 *a3, s16 *a4) +{ + struct Sprite *playerSpr = &gSprites[gPlayerAvatar.spriteId]; + struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + if (a1 > 0 || *a4 > 6) + *a3 += a1; + *a2 += a0; + (*a4)++; + playerSpr->pos2.x = *a2 >> 5; + playerSpr->pos2.y = *a3 >> 5; + if (playerObj->mapobj_bit_7) + { + FieldObjectForceSetSpecialAnim(playerObj, GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection())); + } +} + +static void sub_807EB64(u16 a0, s16 *a1, s16 *a2) +{ + FieldObjectForceSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection())); + sub_807EBBC(a0, a1, a2); +} + +static void sub_807EBBC(u8 a0, s16 *a1, s16 *a2) +{ + if (MetatileBehavior_IsUnknownWarp6C(a0)) + { + *a1 = 16; + *a2 = -10; + } + else if (MetatileBehavior_IsUnknownWarp6D(a0)) + { + *a1 = -17; + *a2 = -10; + } + else if (MetatileBehavior_IsUnknownWarp6E(a0)) + { + *a1 = 17; + *a2 = 3; + } + else if (MetatileBehavior_IsUnknownWarp6F(a0)) + { + *a1 = -17; + *a2 = 3; + } + else + { + *a1 = 0; + *a2 = 0; + } +} + +static void sub_807EC34(u8 taskId) +{ + s16 * data = gTasks[taskId].data; + switch (data[0]) + { + default: + if (sub_807E418() == TRUE) + { + CameraObjectReset1(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + case 0: + Overworld_PlaySpecialMapMusic(); + pal_fill_for_maplights(); + ScriptContext2_Enable(); + sub_807ECBC(&data[1], &data[2], &data[3], &data[4], &data[5]); + data[0]++; + break; + case 1: + if (!sub_807EDA0(&data[1], &data[2], &data[3], &data[4], &data[5])) + data[0]++; + break; + } +} + +static void sub_807ECBC(s16 *a0, s16 *a1, s16 *a2, s16 *a3, s16 *a4) +{ + s16 x, y; + u8 behavior; + s32 r1; + struct Sprite *sprite; + PlayerGetDestCoords(&x, &y); + behavior = MapGridGetMetatileBehaviorAt(x, y); + if (MetatileBehavior_IsUnknownWarp6E(behavior) || MetatileBehavior_IsUnknownWarp6C(behavior)) + r1 = 3; + else + r1 = 4; + FieldObjectForceSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], sub_8064270(r1)); + sub_807EBBC(behavior, a0, a1); + *a2 = *a0 * 16; + *a3 = *a1 * 16; + *a4 = 16; + sprite = &gSprites[gPlayerAvatar.spriteId]; + sprite->pos2.x = *a2 >> 5; + sprite->pos2.y = *a3 >> 5; + *a0 *= -1; + *a1 *= -1; +} + +static bool8 sub_807EDA0(s16 *a0, s16 *a1, s16 *a2, s16 *a3, s16 *a4) +{ + struct Sprite *sprite; + sprite = &gSprites[gPlayerAvatar.spriteId]; + if (*a4 != 0) + { + *a2 += *a0; + *a3 += *a1; + sprite->pos2.x = *a2 >> 5; + sprite->pos2.y = *a3 >> 5; + (*a4)--; + return TRUE; + } + else + { + sprite->pos2.x = 0; + sprite->pos2.y = 0; + return FALSE; + } +} diff --git a/src/map_preview_screen.c b/src/map_preview_screen.c index a17f37802..7d9fa935e 100644 --- a/src/map_preview_screen.c +++ b/src/map_preview_screen.c @@ -461,7 +461,7 @@ u16 sub_80F8318(u8 mapsec) return windowId; } -bool8 sub_80F83B0(void) +bool32 sub_80F83B0(void) { if (FuncIsActiveTask(sub_80F83D0) == TRUE) { |