summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-10-06 22:00:21 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2018-10-06 22:00:21 -0400
commitb09d7508d0064ec1d2fe490923d5acc8b272ed27 (patch)
tree24aa4f03c6715e2e567eabbc5d4d6d67684d753e /include
parentb6cc51de43826e74fef7967b1694133a87c215f9 (diff)
sub_810C9A8
Diffstat (limited to 'include')
-rw-r--r--include/field_map_obj.h1
-rw-r--r--include/global.h3
-rw-r--r--include/vs_seeker.h9
3 files changed, 10 insertions, 3 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 0107fa10f..803ed275b 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -76,6 +76,7 @@ void MoveCoords(u8, s16 *, s16 *);
bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *);
u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z);
+void npc_coords_shift_still(struct MapObject *);
// Exported data declarations
diff --git a/include/global.h b/include/global.h
index 7fa5cfafe..f1a5fbc18 100644
--- a/include/global.h
+++ b/include/global.h
@@ -482,7 +482,8 @@ struct SaveBlock1
/*0x24*/ struct WarpData warp4;
/*0x002C*/ u8 filler2C[0x60C];
/*0x638*/ u8 trainerRematchStepCounter;
- /*0x639*/ u8 trainerRematches[100];
+ u8 filler_639;
+ /*0x63a*/ u8 trainerRematches[100];
/*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT];
/*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64];
/*0x0EE0*/ u8 fillerEE0[0x273C];
diff --git a/include/vs_seeker.h b/include/vs_seeker.h
index e01713f49..d79035576 100644
--- a/include/vs_seeker.h
+++ b/include/vs_seeker.h
@@ -17,8 +17,13 @@ struct VsSeekerSubstruct
struct VsSeekerStruct
{
/*0x000*/ struct VsSeekerSubstruct unk_000[MAP_OBJECTS_COUNT];
- /*0x100*/ u8 filler_100[0x331];
- /*0x431*/ u8 unk_431_0:3;
+ /*0x100*/ u8 filler_100[0x300];
+ /*0x400*/ u16 unk_400[0x10];
+ /*0x420*/ u8 unk_420[0x10];
+ /*0x430*/ u8 unk_430;
+ /*0x431*/ u8 unk_431_0:1;
+ /*0x431*/ u8 unk_431_1:1;
+ /*0x431*/ u8 unk_431_2:1;
u8 unk_431_3:5;
};