summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/constants/event_objects.h4
-rw-r--r--include/field_player_avatar.h4
-rw-r--r--include/global.fieldmap.h9
-rw-r--r--include/quest_log.h28
-rw-r--r--include/quest_log_player.h16
5 files changed, 42 insertions, 19 deletions
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
index 2e9fcaa83..f1291b1ea 100644
--- a/include/constants/event_objects.h
+++ b/include/constants/event_objects.h
@@ -4,14 +4,14 @@
#define OBJ_EVENT_GFX_RED_NORMAL 0
#define OBJ_EVENT_GFX_RED_BIKE 1
#define OBJ_EVENT_GFX_RED_SURF 2
-#define OBJ_EVENT_GFX_RED_ITEM 3
+#define OBJ_EVENT_GFX_RED_FIELD_MOVE 3
#define OBJ_EVENT_GFX_RED_FISH 4
#define OBJ_EVENT_GFX_RED_VS_SEEKER 5
#define OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE 6
#define OBJ_EVENT_GFX_GREEN_NORMAL 7
#define OBJ_EVENT_GFX_GREEN_BIKE 8
#define OBJ_EVENT_GFX_GREEN_SURF 9
-#define OBJ_EVENT_GFX_GREEN_ITEM 10
+#define OBJ_EVENT_GFX_GREEN_FIELD_MOVE 10
#define OBJ_EVENT_GFX_GREEN_FISH 11
#define OBJ_EVENT_GFX_GREEN_VS_SEEKER 12
#define OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE 13
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 60ece38fe..b13bf6fb9 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -28,7 +28,7 @@ void StartFishing(u8 secondaryId);
u8 GetPlayerAvatarObjectId(void);
u8 PlayerGetZCoord(void);
u8 GetPlayerAvatarGraphicsIdByCurrentState(void);
-void sub_805CB70(void);
+void StartPlayerAvatarSummonMonForFieldMoveAnim(void);
void SetPlayerInvisibility(bool8);
void StartTeleportInPlayerAnim(void);
void StartTeleportWarpOutPlayerAnim(void);
@@ -37,7 +37,7 @@ bool32 WaitTeleportInPlayerAnim(void);
bool8 PartyHasMonWithSurf(void);
bool8 IsPlayerSurfingNorth(void);
u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y);
-void sub_805CBE8(void);
+void StartPlayerAvatarVsSeekerAnim(void);
u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender);
u8 GetPlayerAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender);
u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index c481968cf..80331804b 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -293,6 +293,15 @@ enum {
#define PLAYER_AVATAR_FLAG_FISHING (1 << PLAYER_AVATAR_STATE_FISHING)
#define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_WATERING)
+enum {
+ PLAYER_AVATAR_GFX_NORMAL,
+ PLAYER_AVATAR_GFX_BIKE,
+ PLAYER_AVATAR_GFX_SURF,
+ PLAYER_AVATAR_GFX_FIELD_MOVE,
+ PLAYER_AVATAR_GFX_FISH,
+ PLAYER_AVATAR_GFX_VSSEEKER,
+};
+
enum
{
ACRO_BIKE_NORMAL,
diff --git a/include/quest_log.h b/include/quest_log.h
index ffe5c2cea..a9a04657e 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -8,10 +8,11 @@
struct QuestLogEntry
{
- u8 localId;
- u8 mapNum;
- u8 mapGroup;
- u8 animId;
+ // When command == 2, these fields have different meanings
+ u8 localId; // cmd == 2: Pressed A/B, checked wild, held direction, took step
+ u8 mapNum; // cmd == 2: Always set to 0
+ u8 mapGroup; // cmd == 2: Dpad direction
+ u8 animId; // cmd == 2: Always set to 0
u16 duration;
u8 command;
};
@@ -32,7 +33,7 @@ extern u16 *gUnknown_203AE04;
extern u16 *sEventRecordingPointer;
extern u16 sQuestLogCursor;
-void sub_8112720(u8);
+void QuestLogRecordPlayerAvatarGfxTransition(u8);
void SetQuestLogEvent(u16, const u16 *);
void SetQLPlayedTheSlots(void);
void QuestLog_RecordEnteredMap(u16);
@@ -54,15 +55,18 @@ void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx);
void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value);
void SetQuestLogRecordAndPlaybackPointers(void *oldSave);
void sub_811246C(struct Sprite *sprite);
-void sub_81124EC(u8 a0, u8 a1, u8 a2, u8 a3);
+void QuestLogRecordNPCStep(u8 a0, u8 a1, u8 a2, u8 a3);
bool8 sub_8111C2C(void);
-void sub_81128BC(u8 a0);
-void sub_811278C(u8 movementActionId, u8 duration);
+
+#define QL_ESCALATOR_OUT 1
+#define QL_ESCALATOR_IN 2
+void QuestLog_OnEscalatorWarp(u8 direction);
+void QuestLogRecordPlayerAvatarGfxTransitionWithDuration(u8 movementActionId, u8 duration);
void Special_UpdateTrainerFansAfterLinkBattle(void);
-void sub_8112628(u8 movementActionId);
-void sub_81126AC(u8 movementActionId, u8 duration);
-void sub_8112588(u8 localId, u8 mapNum, u8 mapGroup, u8 movementActionId, u8 duration);
-void sub_8112C9C(void);
+void QuestLogRecordPlayerStep(u8 movementActionId);
+void QuestLogRecordPlayerStepWithDuration(u8 movementActionId, u8 duration);
+void QuestLogRecordNPCStepWithDuration(u8 localId, u8 mapNum, u8 mapGroup, u8 movementActionId, u8 duration);
+void QL_AfterRecordFishActionSuccessful(void);
void sub_8110920(void);
void sub_8111708(void);
void sub_81127F8(struct FieldInput * a0);
diff --git a/include/quest_log_player.h b/include/quest_log_player.h
index 5aee3f2d0..2b6bb182c 100644
--- a/include/quest_log_player.h
+++ b/include/quest_log_player.h
@@ -3,8 +3,18 @@
#include "global.h"
-void sub_8150454(void);
-bool32 sub_8150474(u8 a0);
-void sub_8150498(u8 a0);
+#define QL_PLAYER_GFX_NORMAL 0
+#define QL_PLAYER_GFX_BIKE 1
+#define QL_PLAYER_GFX_FISH 2
+#define QL_PLAYER_GFX_SURF 3
+#define QL_PLAYER_GFX_STOP_SURF_S 4
+#define QL_PLAYER_GFX_STOP_SURF_N 5
+#define QL_PLAYER_GFX_STOP_SURF_W 6
+#define QL_PLAYER_GFX_STOP_SURF_E 7
+#define QL_PLAYER_GFX_VSSEEKER 8
+
+void QuestLogUpdatePlayerSprite(u8 state);
+bool32 QuestLogTryRecordPlayerAvatarGfxTransition(u8 state);
+void QuestLogCallUpdatePlayerSprite(u8 state);
#endif //GUARD_QUEST_LOG_PLAYER_H