Rename unk headers

6 files changed, 29 insertions, 34 deletions

diff --git a/include/unk_815c27c.h b/include/ereader_helpers.h
index 02c886895..748db7190 100644
--- a/include/unk_815c27c.h
+++ b/include/ereader_helpers.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_UNK_815C27C_H
-#define GUARD_UNK_815C27C_H
+#ifndef GUARD_EREADER_HELPERS_H
+#define GUARD_EREADER_HELPERS_H
 
 void EReaderHelper_SerialCallback(void);
 void EReaderHelper_Timer3Callback(void);
@@ -8,4 +8,4 @@ void EReaderHelper_ClearsSendRecvMgr(void);
 void EReaderHelper_RestoreRegsState(void);
 u16 EReaderHandleTransfer(u8, size_t, const void *, void *);
 
-#endif //GUARD_UNK_815C27C_H
+#endif //GUARD_EREADER_HELPERS_H
diff --git a/include/unk_810c3a4.h b/include/unk_810c3a4.h
deleted file mode 100644
index 11a91b5ef..000000000
--- a/include/unk_810c3a4.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef GUARD_UNK_810C3A4_H
-#define GUARD_UNK_810C3A4_H
-
-#define GET_VS_SEEKER_COUNTER_0() (gSaveBlock1Ptr->trainerRematch.stepCounter & 0xFF)
-#define GET_VS_SEEKER_COUNTER_1() (gSaveBlock1Ptr->trainerRematch.stepCounter >> 8)
-#define SET_VS_SEEKER_COUNTER_0(x) ({\
-    gSaveBlock1Ptr->trainerRematch.stepCounter &= 0xFF00;\
-    gSaveBlock1Ptr->trainerRematch.stepCounter |= (x);\
-})
-#define SET_VS_SEEKER_COUNTER_1(x) ({\
-    gSaveBlock1Ptr->trainerRematch.stepCounter &= 0x00FF;\
-    gSaveBlock1Ptr->trainerRematch.stepCounter |= ((x) << 8);\
-})
-#define INC_VS_SEEKER_COUNTER_0() ({\
-    u8 x = GET_VS_SEEKER_COUNTER_0();\
-    if (x < 100) gSaveBlock1Ptr->trainerRematch.stepCounter++;\
-})
-#define INC_VS_SEEKER_COUNTER_1() ({\
-    u8 x = GET_VS_SEEKER_COUNTER_1();\
-    if (x < 100) {x++; SET_VS_SEEKER_COUNTER_1(x);}\
-})
-
-void sub_810C604(void);
-void sub_810C640(void);
-
-#endif //GUARD_UNK_810C3A4_H
diff --git a/include/vs_seeker.h b/include/vs_seeker.h
index fdd6839df..428278192 100644
--- a/include/vs_seeker.h
+++ b/include/vs_seeker.h
@@ -3,6 +3,28 @@
 
 #include "global.h"
 
+#define GET_VS_SEEKER_COUNTER_0() (gSaveBlock1Ptr->trainerRematch.stepCounter & 0xFF)
+#define GET_VS_SEEKER_COUNTER_1() (gSaveBlock1Ptr->trainerRematch.stepCounter >> 8)
+#define SET_VS_SEEKER_COUNTER_0(x) ({\
+    gSaveBlock1Ptr->trainerRematch.stepCounter &= 0xFF00;\
+    gSaveBlock1Ptr->trainerRematch.stepCounter |= (x);\
+})
+#define SET_VS_SEEKER_COUNTER_1(x) ({\
+    gSaveBlock1Ptr->trainerRematch.stepCounter &= 0x00FF;\
+    gSaveBlock1Ptr->trainerRematch.stepCounter |= ((x) << 8);\
+})
+#define INC_VS_SEEKER_COUNTER_0() ({\
+    u8 x = GET_VS_SEEKER_COUNTER_0();\
+    if (x < 100) gSaveBlock1Ptr->trainerRematch.stepCounter++;\
+})
+#define INC_VS_SEEKER_COUNTER_1() ({\
+    u8 x = GET_VS_SEEKER_COUNTER_1();\
+    if (x < 100) {x++; SET_VS_SEEKER_COUNTER_1(x);}\
+})
+
+void sub_810C604(void);
+void sub_810C640(void);
+
 void Task_VsSeeker_0(u8 taskId);
 void sub_810CB90(void);
 void sub_810CDE8(void);
diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index cce6cefca..a74f63069 100644
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "link.h"
-#include "unk_815c27c.h"
+#include "ereader_helpers.h"
 
 enum {
     EREADER_XFR_STATE_INIT,
diff --git a/src/sprite.c b/src/sprite.c
index d109a8347..945aecc2e 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -1222,10 +1222,10 @@ u8 GetSpriteMatrixNum(struct Sprite *sprite)
     return matrixNum;
 }
 
-void obj_pos2_update_enable(struct Sprite* sprite, s16 a2, s16 a3)
+void obj_pos2_update_enable(struct Sprite* sprite, s16 xmod, s16 ymod)
 {
-    sprite->data[6] = a2;
-    sprite->data[7] = a3;
+    sprite->data[6] = xmod;
+    sprite->data[7] = ymod;
     sprite->flags_f = 1;
 }
 
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index c0f53d5c2..9c9a4d67f 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -22,7 +22,6 @@
 #include "field_player_avatar.h"
 #include "event_object_80688E4.h"
 #include "event_object_8097404.h"
-#include "unk_810c3a4.h"
 #include "vs_seeker.h"
 #include "constants/movement_commands.h"
 #include "constants/object_events.h"