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

Remove defunct macros and move trainer tower pointers and dummy header

Browse Source
This commit is contained in:
PikalaxALT
2020-02-11 16:56:09 -05:00
parent 325c5b3f11
commit 32dc21b634
3 changed files with 40 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vs_seeker.h
-19
View File
@@ -3,25 +3,6 @@
#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);