Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some harmless or completely superseded PRs have been left alone, as there is not much benefit in attempting to undo them. Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136, #1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179, #1180, #1181, #1182 and #1183.
This commit is contained in:
+5
-5
@@ -168,8 +168,8 @@ struct BerryBlender
|
||||
u16 progressBarValue;
|
||||
u16 maxProgressBarValue;
|
||||
u16 centerScale;
|
||||
s16 bg_X;
|
||||
s16 bg_Y;
|
||||
u16 bg_X;
|
||||
u16 bg_Y;
|
||||
u8 opponentTaskIds[BLENDER_MAX_PLAYERS - 1];
|
||||
u8 perfectOpponents; // for debugging, NPCs will always hit Best
|
||||
u16 scores[BLENDER_MAX_PLAYERS][NUM_SCORE_TYPES];
|
||||
@@ -3387,13 +3387,13 @@ static void RestoreBgCoord(s16* coord)
|
||||
// For "unshaking" the screen after ShakeBgCoordForHit is called
|
||||
static void RestoreBgCoords(void)
|
||||
{
|
||||
RestoreBgCoord((s16 *)&sBerryBlender->bg_X);
|
||||
RestoreBgCoord((s16 *)&sBerryBlender->bg_Y);
|
||||
RestoreBgCoord(&sBerryBlender->bg_X);
|
||||
RestoreBgCoord(&sBerryBlender->bg_Y);
|
||||
}
|
||||
|
||||
static void BlenderLandShakeBgCoord(s16* coord, u16 timer)
|
||||
{
|
||||
u8 strength;
|
||||
s32 strength;
|
||||
|
||||
if (timer < 10)
|
||||
strength = 16;
|
||||
|
||||
Reference in New Issue
Block a user