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

Rename unk headers

Browse Source
This commit is contained in:
PikalaxALT
2020-02-11 13:49:19 -05:00
parent 9ff146b0bc
commit 11af7a0751
6 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/unk_815c27c.h → include/ereader_helpers.h
+3 -3
View File
@@ -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
include/unk_810c3a4.h
-26
View File
@@ -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
include/vs_seeker.h
+22
View File
@@ -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);
src/ereader_helpers.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include "global.h"
#include "link.h"
#include "unk_815c27c.h"
#include "ereader_helpers.h"
enum {
EREADER_XFR_STATE_INIT,
src/sprite.c
+3 -3
View File
@@ -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;
}
src/vs_seeker.c
-1
View File
@@ -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"