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

Finish field_fadetransition

Browse Source
This commit is contained in:
PikalaxALT
2019-09-26 10:50:41 -04:00
parent bdeea4ca28
commit 3a6b6bf9e9
10 changed files with 493 additions and 1309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_fadetransition.s
-1306
View File
File diff suppressed because it is too large Load Diff
include/field_effect.h
+4
View File
@@ -85,5 +85,9 @@ void FieldEffectActiveListRemove(u8 id);
void sub_8085620(void);
void FieldEffectStop(struct Sprite *sprite, u8 id);
u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
void sub_8084454(void);
void sub_8084784(u8 a0, u8 a1);
void sub_8084F2C(u8 a0);
void sub_80853CC(u8 a0);
#endif //GUARD_FIELD_EFFECTS_H
include/field_map_obj.h
+3
View File
@@ -52,9 +52,12 @@ u8 SpawnSpecialFieldObjectParameterized(u8, u8, u8, s16, s16, u8);
u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
void sub_8093038(s16, s16, s16 *, s16 *);
void CameraObjectReset1(void);
void CameraObjectReset2(void);
void FieldObjectSetGraphicsId(struct MapObject *, u8);
void FieldObjectTurn(struct MapObject *, u8);
void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
void FieldObjectForceSetSpecialAnim(struct MapObject *, u8);
u8 sub_8064270(u8 a0);
const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
void gpu_pal_allocator_reset__manage_upper_four(void);
include/field_player_avatar.h
+2
View File
@@ -30,6 +30,8 @@ u8 GetPlayerAvatarGraphicsIdByCurrentState(void);
void sub_805CB70(void);
void sub_805CB04(bool8);
void sub_805DC04(void);
void sub_805DAB0(void);
bool32 sub_805DAD0(void);
bool32 sub_805DC24(void);
#endif //GUARD_FIELD_PLAYER_AVATAR_H
include/link.h
+1
View File
@@ -214,5 +214,6 @@ void sub_800B1F4(void);
void LoadWirelessStatusIndicatorSpriteGfx(void);
void CreateWirelessStatusIndicatorSprite(u8, u8);
void sub_8009FE8(void);
void sub_800A068(void);
#endif // GUARD_LINK_H
include/map_preview_screen.h
+1
View File
@@ -48,5 +48,6 @@ 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);
#endif //GUARD_MAP_PREVIEW_SCREEN_H
include/overworld.h
+2
View File
@@ -135,6 +135,8 @@ u8 GetCurrentMapType(void);
u8 get_map_light_from_warp0(void);
const struct MapHeader *warp1_get_mapheader(void);
void sub_8055F88(void);
void sub_8056788(void);
void Overworld_CreditsMainCB(void);
bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd *, u8);
ld_script.txt
+1 -2
View File
@@ -119,8 +119,7 @@ SECTIONS {
src/reset_save_heap.o(.text);
asm/field_weather.o(.text);
asm/field_weather_effects.o(.text);
src/field_fadetransition.o(.text);
asm/field_fadetransition.o(.text);
src/field_fadetransition.o(.text);;
asm/field_screen_effect.o(.text);
asm/battle_setup.o(.text);
asm/cable_club.o(.text);
src/field_fadetransition.c
+478
View File
@@ -16,9 +16,11 @@
#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"
@@ -28,7 +30,16 @@ void sub_807DFBC(u8 taskId);
void task_map_chg_seq_0807E20C(u8 taskId);
void task_map_chg_seq_0807E2CC(u8 taskId);
void sub_807E31C(u8 taskId);
void sub_807E718(u8 taskId);
void sub_807E784(u8 taskId);
void sub_807E80C(u8 taskId);
void sub_807E980(u8 taskId);
void sub_807EB64(u16, s16*, s16*);
void sub_807EBBC(u8 a0, s16 *a1, s16 *a2);
void sub_807EAC4(s16, s16, s16*, s16*, s16*);
void sub_807EC34(u8 taskId);
void sub_807ECBC(s16 *, s16 *, s16 *, s16 *, s16 *);
bool8 sub_807EDA0(s16 *, s16 *, s16 *, s16 *, s16 *);
void sub_807F204(u8 taskId);
void palette_bg_faded_fill_white(void)
@@ -486,3 +497,470 @@ bool32 sub_807E3BC(void)
sub_806F1D4();
return FALSE;
}
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);
}
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;
}
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);
}
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);
}
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;
}
}
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;
}
}
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;
}
}
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;
}
}
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()));
}
}
void sub_807EB64(u16 a0, s16 *a1, s16 *a2)
{
FieldObjectForceSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection()));
sub_807EBBC(a0, a1, a2);
}
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;
}
}
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;
}
}
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;
}
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;
}
}
src/map_preview_screen.c
+1 -1
View File
@@ -461,7 +461,7 @@ u16 sub_80F8318(u8 mapsec)
return windowId;
}
bool8 sub_80F83B0(void)
bool32 sub_80F83B0(void)
{
if (FuncIsActiveTask(sub_80F83D0) == TRUE)
{