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

through PlayerSetAnimId; some quest log doc

Browse Source
This commit is contained in:
PikalaxALT
2020-03-24 08:56:14 -04:00
parent 58535acf88
commit 87b2c7f34b
9 changed files with 284 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_player_avatar.c
+15
View File
@@ -764,3 +764,18 @@ u8 PlayerGetCopyableMovement(void)
{
return gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement;
}
void PlayerForceSetHeldMovement(u8 a)
{
ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], a);
}
void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement)
{
if (!PlayerIsAnimActive())
{
PlayerSetCopyableMovement(copyableMovement);
if (!ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], movementActionId))
sub_8112628(movementActionId);
}
}
src/new_menu_helpers.c
+1 -1
View File
@@ -496,7 +496,7 @@ void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram)
if (copyToVram == TRUE)
CopyWindowToVram(windowId, 3);
if (gQuestLogState == 2)
sub_8111134();
CommitQuestLogWindow1();
}
void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram)
src/quest_log.c
+253 -253
View File
File diff suppressed because it is too large Load Diff
src/quest_log_objects.c
+2 -2
View File
@@ -45,7 +45,7 @@ void SetQuestLogObjectEventsData(struct QuestLog * questLog)
}
}
void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates)
void SetSav1ObjectEventsFromQuestLog(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates)
{
u32 i, j;
const struct QuestLogObjectEvent * questLogObjectEvents = questLog->unk_008;
@@ -131,7 +131,7 @@ void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTempl
void sub_815A540(void)
{
if (gQuestLogState == 2)
if (gQuestLogState == QL_STATE_2)
{
s16 x, y;