summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/apprentice.c2
-rw-r--r--src/bard_music.c1
-rw-r--r--src/battle_anim_smokescreen.c1
-rw-r--r--src/battle_dome.c1
-rw-r--r--src/battle_pike.c1
-rw-r--r--src/battle_tower.c13
-rwxr-xr-xsrc/data/easy_chat/easy_chat_words_by_letter.h1
-rw-r--r--src/data/lilycove_lady.h1
-rw-r--r--src/dewford_trend.c1
-rw-r--r--src/easy_chat.c1
-rwxr-xr-xsrc/ereader_helpers.c1
-rw-r--r--src/field_player_avatar.c4
-rw-r--r--src/field_specials.c1537
-rw-r--r--src/frontier_pass.c2
-rw-r--r--src/graphics.c12
-rw-r--r--src/mail_data.c1
-rw-r--r--src/main_menu.c2
-rw-r--r--src/mauville_old_man.c1
-rwxr-xr-xsrc/party_menu.c1
-rw-r--r--src/save.c4
-rw-r--r--src/slot_machine.c27
-rw-r--r--src/title_screen.c2
-rw-r--r--src/trade.c1
-rw-r--r--src/trader.c6
-rw-r--r--src/trainer_hill.c1
25 files changed, 717 insertions, 908 deletions
diff --git a/src/apprentice.c b/src/apprentice.c
index 2ab2f0e5a..591ab79e4 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -23,9 +23,7 @@
#include "task.h"
#include "text.h"
#include "constants/battle_frontier.h"
-#include "constants/easy_chat.h"
#include "constants/items.h"
-#include "constants/pokemon.h"
#include "constants/songs.h"
#include "constants/trainers.h"
#include "constants/moves.h"
diff --git a/src/bard_music.c b/src/bard_music.c
index 114f1cf42..bdc5ac808 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -1,6 +1,5 @@
#include "global.h"
#include "bard_music.h"
-#include "constants/easy_chat.h"
#include "easy_chat.h"
#include "data/bard_music/bard_sounds.h"
diff --git a/src/battle_anim_smokescreen.c b/src/battle_anim_smokescreen.c
index 9844f5007..0819796d2 100644
--- a/src/battle_anim_smokescreen.c
+++ b/src/battle_anim_smokescreen.c
@@ -5,7 +5,6 @@
#include "graphics.h"
#include "sprite.h"
#include "util.h"
-#include "constants/pokemon.h"
#include "constants/battle_palace.h"
static void SmokescreenImpact_Callback(struct Sprite *);
diff --git a/src/battle_dome.c b/src/battle_dome.c
index 293662985..2f77491c9 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -34,7 +34,6 @@
#include "constants/battle_dome.h"
#include "constants/frontier_util.h"
#include "constants/moves.h"
-#include "constants/pokemon.h"
#include "constants/trainers.h"
#include "constants/abilities.h"
#include "constants/songs.h"
diff --git a/src/battle_pike.c b/src/battle_pike.c
index d889d7cdd..2b0cf6420 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -17,7 +17,6 @@
#include "constants/battle_frontier.h"
#include "constants/frontier_util.h"
#include "constants/abilities.h"
-#include "constants/easy_chat.h"
#include "constants/layouts.h"
#include "constants/rgb.h"
#include "constants/trainers.h"
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 7ed15d1e6..b747a3dc0 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -35,7 +35,6 @@
#include "constants/trainers.h"
#include "constants/event_objects.h"
#include "constants/moves.h"
-#include "constants/easy_chat.h"
extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer[];
extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer[];
@@ -1007,7 +1006,7 @@ static bool8 ChooseSpecialBattleTowerTrainer(void)
validMons = 0;
for (j = 0; j < MAX_FRONTIER_PARTY_SIZE; j++)
{
- if (gSaveBlock2Ptr->frontier.towerRecords[i].party[j].species != 0
+ if (gSaveBlock2Ptr->frontier.towerRecords[i].party[j].species != SPECIES_NONE
&& gSaveBlock2Ptr->frontier.towerRecords[i].party[j].level <= GetFrontierEnemyMonLevel(lvlMode))
validMons++;
}
@@ -1665,7 +1664,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount)
// Record mixed player.
for (j = 0, i = firstMonId; i < firstMonId + monCount; j++, i++)
{
- if (gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].party[j].species != 0
+ if (gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].party[j].species != SPECIES_NONE
&& gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].party[j].level <= level)
{
CreateBattleTowerMon_HandleLevel(&gEnemyParty[i], &gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].party[j], FALSE);
@@ -1707,7 +1706,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount)
// Ensure this Pokemon's held item isn't a duplicate.
for (j = 0; j < i + firstMonId; j++)
{
- if (GetMonData(&gEnemyParty[j], MON_DATA_HELD_ITEM, NULL) != 0
+ if (GetMonData(&gEnemyParty[j], MON_DATA_HELD_ITEM, NULL) != ITEM_NONE
&& GetMonData(&gEnemyParty[j], MON_DATA_HELD_ITEM, NULL) == gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId])
break;
}
@@ -2245,7 +2244,7 @@ static void GetRecordMixFriendMultiPartnerParty(u16 trainerId)
if (gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].party[i].species != species1
&& gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].party[i].species != species2
&& gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].party[i].level <= GetFrontierEnemyMonLevel(lvlMode)
- && gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].party[i].species != 0)
+ && gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].party[i].species != SPECIES_NONE)
{
validSpecies[count] = i;
count++;
@@ -2384,7 +2383,7 @@ static void LoadMultiPartnerCandidatesData(void)
if (species1 != gSaveBlock2Ptr->frontier.towerRecords[i].party[j].species
&& species2 != gSaveBlock2Ptr->frontier.towerRecords[i].party[j].species
&& gSaveBlock2Ptr->frontier.towerRecords[i].party[j].level <= GetFrontierEnemyMonLevel(lvlMode)
- && gSaveBlock2Ptr->frontier.towerRecords[i].party[j].species != 0)
+ && gSaveBlock2Ptr->frontier.towerRecords[i].party[j].species != SPECIES_NONE)
{
k++;
}
@@ -3411,7 +3410,7 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount)
// Ensure this Pokemon's held item isn't a duplicate.
for (j = 0; j < i + firstMonId; j++)
{
- if (GetMonData(&gEnemyParty[j], MON_DATA_HELD_ITEM, NULL) != 0
+ if (GetMonData(&gEnemyParty[j], MON_DATA_HELD_ITEM, NULL) != ITEM_NONE
&& GetMonData(&gEnemyParty[j], MON_DATA_HELD_ITEM, NULL) == gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId])
break;
}
diff --git a/src/data/easy_chat/easy_chat_words_by_letter.h b/src/data/easy_chat/easy_chat_words_by_letter.h
index a56e3184f..235afbb78 100755
--- a/src/data/easy_chat/easy_chat_words_by_letter.h
+++ b/src/data/easy_chat/easy_chat_words_by_letter.h
@@ -1,5 +1,4 @@
#include "easy_chat.h"
-#include "constants/easy_chat.h"
#define DOUBLE_SPECIES_NAME EC_EMPTY_WORD, 2,
diff --git a/src/data/lilycove_lady.h b/src/data/lilycove_lady.h
index dd0885ff8..4a3a7a719 100644
--- a/src/data/lilycove_lady.h
+++ b/src/data/lilycove_lady.h
@@ -1,4 +1,3 @@
-#include "constants/easy_chat.h"
#include "constants/event_objects.h"
#include "constants/items.h"
#include "constants/moves.h"
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index bba2085e8..08dd9afe0 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -8,7 +8,6 @@
#include "text.h"
#include "tv.h"
#include "string_util.h"
-#include "constants/easy_chat.h"
/*
## Overview ##
diff --git a/src/easy_chat.c b/src/easy_chat.c
index f9ba44ba7..734fd4f18 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -27,7 +27,6 @@
#include "task.h"
#include "text_window.h"
#include "window.h"
-#include "constants/easy_chat.h"
#include "constants/event_objects.h"
#include "constants/lilycove_lady.h"
#include "constants/mauville_old_man.h"
diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index 0de87602e..c3f17f234 100755
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -10,7 +10,6 @@
#include "task.h"
#include "util.h"
#include "trainer_hill.h"
-#include "constants/easy_chat.h"
#include "constants/trainers.h"
#include "constants/moves.h"
#include "constants/items.h"
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 6cf468b3e..3c0276a27 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -735,13 +735,13 @@ static bool8 TryPushBoulder(s16 x, s16 y, u8 direction)
{
u8 objectEventId = GetObjectEventIdByXY(x, y);
- if (objectEventId != 16 && gObjectEvents[objectEventId].graphicsId == OBJ_EVENT_GFX_PUSHABLE_BOULDER)
+ if (objectEventId != OBJECT_EVENTS_COUNT && gObjectEvents[objectEventId].graphicsId == OBJ_EVENT_GFX_PUSHABLE_BOULDER)
{
x = gObjectEvents[objectEventId].currentCoords.x;
y = gObjectEvents[objectEventId].currentCoords.y;
MoveCoords(direction, &x, &y);
if (GetCollisionAtCoords(&gObjectEvents[objectEventId], x, y, direction) == COLLISION_NONE
- && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)) == 0)
+ && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)) == FALSE)
{
StartStrengthAnim(objectEventId, direction);
return TRUE;
diff --git a/src/field_specials.c b/src/field_specials.c
index 96eb949e5..d97a17a7d 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -193,59 +193,40 @@ static void DetermineCyclingRoadResults(u32 numFrames, u8 numBikeCollisions)
result = 0;
if (numBikeCollisions == 0)
- {
result = 5;
- }
else if (numBikeCollisions < 4)
- {
result = 4;
- }
else if (numBikeCollisions < 10)
- {
result = 3;
- }
else if (numBikeCollisions < 20)
- {
result = 2;
- }
else if (numBikeCollisions < 100)
- {
result = 1;
- }
if (numFrames / 60 <= 10)
- {
result += 5;
- }
else if (numFrames / 60 <= 15)
- {
result += 4;
- }
else if (numFrames / 60 <= 20)
- {
result += 3;
- }
else if (numFrames / 60 <= 40)
- {
result += 2;
- }
else if (numFrames / 60 < 60)
- {
result += 1;
- }
-
gSpecialVar_Result = result;
}
-void FinishCyclingRoadChallenge(void) {
+void FinishCyclingRoadChallenge(void)
+{
const u32 numFrames = gMain.vblankCounter1 - sBikeCyclingTimer;
DetermineCyclingRoadResults(numFrames, gBikeCollisions);
RecordCyclingRoadResults(numFrames, gBikeCollisions);
}
-static void RecordCyclingRoadResults(u32 numFrames, u8 numBikeCollisions) {
+static void RecordCyclingRoadResults(u32 numFrames, u8 numBikeCollisions)
+{
u16 low = VarGet(VAR_CYCLING_ROAD_RECORD_TIME_L);
u16 high = VarGet(VAR_CYCLING_ROAD_RECORD_TIME_H);
u32 framesRecord = low + (high << 16);
@@ -258,25 +239,23 @@ static void RecordCyclingRoadResults(u32 numFrames, u8 numBikeCollisions) {
}
}
-u16 GetRecordedCyclingRoadResults(void) {
+u16 GetRecordedCyclingRoadResults(void)
+{
u16 low = VarGet(VAR_CYCLING_ROAD_RECORD_TIME_L);
u16 high = VarGet(VAR_CYCLING_ROAD_RECORD_TIME_H);
u32 framesRecord = low + (high << 16);
if (framesRecord == 0)
- {
return FALSE;
- }
DetermineCyclingRoadResults(framesRecord, VarGet(VAR_CYCLING_ROAD_RECORD_COLLISIONS));
return TRUE;
}
-void UpdateCyclingRoadState(void) {
+void UpdateCyclingRoadState(void)
+{
if (gLastUsedWarp.mapNum == MAP_NUM(ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE) && gLastUsedWarp.mapGroup == MAP_GROUP(ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE))
- {
return;
- }
if (VarGet(VAR_CYCLING_CHALLENGE_STATE) == 2 || VarGet(VAR_CYCLING_CHALLENGE_STATE) == 3)
{
@@ -300,9 +279,8 @@ void ResetSSTidalFlag(void)
bool32 CountSSTidalStep(u16 delta)
{
if (!FlagGet(FLAG_SYS_CRUISE_MODE) || (*GetVarPointer(VAR_CRUISE_STEP_COUNT) += delta) < SS_TIDAL_MAX_STEPS)
- {
return FALSE;
- }
+
return TRUE;
}
@@ -311,51 +289,52 @@ u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y)
u16 *varCruiseStepCount = GetVarPointer(VAR_CRUISE_STEP_COUNT);
switch (*GetVarPointer(VAR_SS_TIDAL_STATE))
{
- case SS_TIDAL_BOARD_SLATEPORT:
- case SS_TIDAL_LAND_SLATEPORT:
- return SS_TIDAL_LOCATION_SLATEPORT;
- case SS_TIDAL_HALFWAY_LILYCOVE:
- case SS_TIDAL_EXIT_CURRENTS_RIGHT:
- return SS_TIDAL_LOCATION_ROUTE131;
- case SS_TIDAL_LAND_LILYCOVE:
- case SS_TIDAL_BOARD_LILYCOVE:
- return SS_TIDAL_LOCATION_LILYCOVE;
- case SS_TIDAL_DEPART_LILYCOVE:
- case SS_TIDAL_EXIT_CURRENTS_LEFT:
- return SS_TIDAL_LOCATION_ROUTE124;
- case SS_TIDAL_DEPART_SLATEPORT:
- if (*varCruiseStepCount < 60)
- {
- *mapNum = MAP_NUM(ROUTE134);
- *x = *varCruiseStepCount + 19;
- }
- else if (*varCruiseStepCount < 140)
- {
- *mapNum = MAP_NUM(ROUTE133);
- *x = *varCruiseStepCount - 60;
- }
- else
- {
- *mapNum = MAP_NUM(ROUTE132);
- *x = *varCruiseStepCount - 140;
- }
- break;
- case SS_TIDAL_HALFWAY_SLATEPORT:
- if (*varCruiseStepCount < 66)
- {
- *mapNum = MAP_NUM(ROUTE132);
- *x = 65 - *varCruiseStepCount;
- }
- else if (*varCruiseStepCount < 146) {
- *mapNum = MAP_NUM(ROUTE133);
- *x = 145 - *varCruiseStepCount;
- }
- else
- {
- *mapNum = MAP_NUM(ROUTE134);
- *x = 224 - *varCruiseStepCount;
- }
- break;
+ case SS_TIDAL_BOARD_SLATEPORT:
+ case SS_TIDAL_LAND_SLATEPORT:
+ return SS_TIDAL_LOCATION_SLATEPORT;
+ case SS_TIDAL_HALFWAY_LILYCOVE:
+ case SS_TIDAL_EXIT_CURRENTS_RIGHT:
+ return SS_TIDAL_LOCATION_ROUTE131;
+ case SS_TIDAL_LAND_LILYCOVE:
+ case SS_TIDAL_BOARD_LILYCOVE:
+ return SS_TIDAL_LOCATION_LILYCOVE;
+ case SS_TIDAL_DEPART_LILYCOVE:
+ case SS_TIDAL_EXIT_CURRENTS_LEFT:
+ return SS_TIDAL_LOCATION_ROUTE124;
+ case SS_TIDAL_DEPART_SLATEPORT:
+ if (*varCruiseStepCount < 60)
+ {
+ *mapNum = MAP_NUM(ROUTE134);
+ *x = *varCruiseStepCount + 19;
+ }
+ else if (*varCruiseStepCount < 140)
+ {
+ *mapNum = MAP_NUM(ROUTE133);
+ *x = *varCruiseStepCount - 60;
+ }
+ else
+ {
+ *mapNum = MAP_NUM(ROUTE132);
+ *x = *varCruiseStepCount - 140;
+ }
+ break;
+ case SS_TIDAL_HALFWAY_SLATEPORT:
+ if (*varCruiseStepCount < 66)
+ {
+ *mapNum = MAP_NUM(ROUTE132);
+ *x = 65 - *varCruiseStepCount;
+ }
+ else if (*varCruiseStepCount < 146)
+ {
+ *mapNum = MAP_NUM(ROUTE133);
+ *x = 145 - *varCruiseStepCount;
+ }
+ else
+ {
+ *mapNum = MAP_NUM(ROUTE134);
+ *x = 224 - *varCruiseStepCount;
+ }
+ break;
}
*mapGroup = MAP_GROUP(ROUTE132);
*y = 20;
@@ -368,17 +347,15 @@ bool32 ShouldDoWallyCall(void)
{
switch (gMapHeader.mapType)
{
- case MAP_TYPE_TOWN:
- case MAP_TYPE_CITY:
- case MAP_TYPE_ROUTE:
- case MAP_TYPE_OCEAN_ROUTE:
- if (++(*GetVarPointer(VAR_WALLY_CALL_STEP_COUNTER)) < 250)
- {
- return FALSE;
- }
- break;
- default:
+ case MAP_TYPE_TOWN:
+ case MAP_TYPE_CITY:
+ case MAP_TYPE_ROUTE:
+ case MAP_TYPE_OCEAN_ROUTE:
+ if (++(*GetVarPointer(VAR_WALLY_CALL_STEP_COUNTER)) < 250)
return FALSE;
+ break;
+ default:
+ return FALSE;
}
}
else
@@ -395,17 +372,15 @@ bool32 ShouldDoScottFortreeCall(void)
{
switch (gMapHeader.mapType)
{
- case MAP_TYPE_TOWN:
- case MAP_TYPE_CITY:
- case MAP_TYPE_ROUTE:
- case MAP_TYPE_OCEAN_ROUTE:
- if (++(*GetVarPointer(VAR_SCOTT_FORTREE_CALL_STEP_COUNTER)) < 10)
- {
- return FALSE;
- }
- break;
- default:
+ case MAP_TYPE_TOWN:
+ case MAP_TYPE_CITY:
+ case MAP_TYPE_ROUTE:
+ case MAP_TYPE_OCEAN_ROUTE:
+ if (++(*GetVarPointer(VAR_SCOTT_FORTREE_CALL_STEP_COUNTER)) < 10)
return FALSE;
+ break;
+ default:
+ return FALSE;
}
}
else
@@ -422,17 +397,15 @@ bool32 ShouldDoScottBattleFrontierCall(void)
{
switch (gMapHeader.mapType)
{
- case MAP_TYPE_TOWN:
- case MAP_TYPE_CITY:
- case MAP_TYPE_ROUTE:
- case MAP_TYPE_OCEAN_ROUTE:
- if (++(*GetVarPointer(VAR_SCOTT_BF_CALL_STEP_COUNTER)) < 10)
- {
- return FALSE;
- }
- break;
- default:
+ case MAP_TYPE_TOWN:
+ case MAP_TYPE_CITY:
+ case MAP_TYPE_ROUTE:
+ case MAP_TYPE_OCEAN_ROUTE:
+ if (++(*GetVarPointer(VAR_SCOTT_BF_CALL_STEP_COUNTER)) < 10)
return FALSE;
+ break;
+ default:
+ return FALSE;
}
}
else
@@ -449,17 +422,15 @@ bool32 ShouldDoRoxanneCall(void)
{
switch (gMapHeader.mapType)
{
- case MAP_TYPE_TOWN:
- case MAP_TYPE_CITY:
- case MAP_TYPE_ROUTE:
- case MAP_TYPE_OCEAN_ROUTE:
- if (++(*GetVarPointer(VAR_ROXANNE_CALL_STEP_COUNTER)) < 250)
- {
- return FALSE;
- }
- break;
- default:
+ case MAP_TYPE_TOWN:
+ case MAP_TYPE_CITY:
+ case MAP_TYPE_ROUTE:
+ case MAP_TYPE_OCEAN_ROUTE:
+ if (++(*GetVarPointer(VAR_ROXANNE_CALL_STEP_COUNTER)) < 250)
return FALSE;
+ break;
+ default:
+ return FALSE;
}
}
else
@@ -476,17 +447,15 @@ bool32 ShouldDoRivalRayquazaCall(void)
{
switch (gMapHeader.mapType)
{
- case MAP_TYPE_TOWN:
- case MAP_TYPE_CITY:
- case MAP_TYPE_ROUTE:
- case MAP_TYPE_OCEAN_ROUTE:
- if (++(*GetVarPointer(VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER)) < 250)
- {
- return FALSE;
- }
- break;
- default:
+ case MAP_TYPE_TOWN:
+ case MAP_TYPE_CITY:
+ case MAP_TYPE_ROUTE:
+ case MAP_TYPE_OCEAN_ROUTE:
+ if (++(*GetVarPointer(VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER)) < 250)
return FALSE;
+ break;
+ default:
+ return FALSE;
}
}
else
@@ -540,24 +509,24 @@ void SpawnLinkPartnerObjectEvent(void)
playerFacingDirection = GetPlayerFacingDirection();
switch (playerFacingDirection)
{
- case DIR_WEST:
- j = 2;
- x = gSaveBlock1Ptr->pos.x - 1;
- y = gSaveBlock1Ptr->pos.y;
- break;
- case DIR_NORTH:
- j = 1;
- x = gSaveBlock1Ptr->pos.x;
- y = gSaveBlock1Ptr->pos.y - 1;
- break;
- case DIR_EAST:
- x = gSaveBlock1Ptr->pos.x + 1;
- y = gSaveBlock1Ptr->pos.y;
- break;
- case DIR_SOUTH:
- j = 3;
- x = gSaveBlock1Ptr->pos.x;
- y = gSaveBlock1Ptr->pos.y + 1;
+ case DIR_WEST:
+ j = 2;
+ x = gSaveBlock1Ptr->pos.x - 1;
+ y = gSaveBlock1Ptr->pos.y;
+ break;
+ case DIR_NORTH:
+ j = 1;
+ x = gSaveBlock1Ptr->pos.x;
+ y = gSaveBlock1Ptr->pos.y - 1;
+ break;
+ case DIR_EAST:
+ x = gSaveBlock1Ptr->pos.x + 1;
+ y = gSaveBlock1Ptr->pos.y;
+ break;
+ case DIR_SOUTH:
+ j = 3;
+ x = gSaveBlock1Ptr->pos.x;
+ y = gSaveBlock1Ptr->pos.y + 1;
}
for (i = 0; i < gSpecialVar_0x8004; i++)
{
@@ -565,33 +534,31 @@ void SpawnLinkPartnerObjectEvent(void)
{
switch ((u8)gLinkPlayers[i].version)
{
- case VERSION_RUBY:
- case VERSION_SAPPHIRE:
- if (gLinkPlayers[i].gender == 0)
- linkSpriteId = OBJ_EVENT_GFX_LINK_RS_BRENDAN;
- else
- linkSpriteId = OBJ_EVENT_GFX_LINK_RS_MAY;
- break;
- case VERSION_EMERALD:
- if (gLinkPlayers[i].gender == 0)
- linkSpriteId = OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL;
- else
- linkSpriteId = OBJ_EVENT_GFX_RIVAL_MAY_NORMAL;
- break;
- default:
- if (gLinkPlayers[i].gender == 0)
- linkSpriteId = OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL;
- else
- linkSpriteId = OBJ_EVENT_GFX_RIVAL_MAY_NORMAL;
- break;
+ case VERSION_RUBY:
+ case VERSION_SAPPHIRE:
+ if (gLinkPlayers[i].gender == 0)
+ linkSpriteId = OBJ_EVENT_GFX_LINK_RS_BRENDAN;
+ else
+ linkSpriteId = OBJ_EVENT_GFX_LINK_RS_MAY;
+ break;
+ case VERSION_EMERALD:
+ if (gLinkPlayers[i].gender == 0)
+ linkSpriteId = OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL;
+ else
+ linkSpriteId = OBJ_EVENT_GFX_RIVAL_MAY_NORMAL;
+ break;
+ default:
+ if (gLinkPlayers[i].gender == 0)
+ linkSpriteId = OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL;
+ else
+ linkSpriteId = OBJ_EVENT_GFX_RIVAL_MAY_NORMAL;
+ break;
}
SpawnSpecialObjectEventParameterized(linkSpriteId, movementTypes[j], 240 - i, coordOffsets[j][0] + x + MAP_OFFSET, coordOffsets[j][1] + y + MAP_OFFSET, 0);
LoadLinkPartnerObjectEventSpritePalette(linkSpriteId, 240 - i, i);
j++;
if (j == MAX_LINK_PLAYERS)
- {
j = 0;
- }
}
}
}
@@ -664,84 +631,84 @@ void MauvilleGymSetDefaultBarriers(void)
{
switch (MapGridGetMetatileIdAt(x, y))
{
- case METATILE_MauvilleGym_GreenBeamH1_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH1_Off);
- break;
- case METATILE_MauvilleGym_GreenBeamH2_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH2_Off);
- break;
- case METATILE_MauvilleGym_GreenBeamH3_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH3_Off);
- break;
- case METATILE_MauvilleGym_GreenBeamH4_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH4_Off);
- break;
- case METATILE_MauvilleGym_GreenBeamH1_Off:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH1_On);
- break;
- case METATILE_MauvilleGym_GreenBeamH2_Off:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH2_On);
- break;
- case METATILE_MauvilleGym_GreenBeamH3_Off:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH3_On | METATILE_COLLISION_MASK);
- break;
- case METATILE_MauvilleGym_GreenBeamH4_Off:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH4_On | METATILE_COLLISION_MASK);
- break;
- case METATILE_MauvilleGym_RedBeamH1_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH1_Off);
- break;
- case METATILE_MauvilleGym_RedBeamH2_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH2_Off);
- break;
- case METATILE_MauvilleGym_RedBeamH3_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH3_Off);
- break;
- case METATILE_MauvilleGym_RedBeamH4_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH4_Off);
- break;
- case METATILE_MauvilleGym_RedBeamH1_Off:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH1_On);
- break;
- case METATILE_MauvilleGym_RedBeamH2_Off:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH2_On);
- break;
- case METATILE_MauvilleGym_RedBeamH3_Off:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH3_On | METATILE_COLLISION_MASK);
- break;
- case METATILE_MauvilleGym_RedBeamH4_Off:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH4_On | METATILE_COLLISION_MASK);
- break;
- case METATILE_MauvilleGym_GreenBeamV1_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_On | METATILE_COLLISION_MASK);
- break;
- case METATILE_MauvilleGym_GreenBeamV2_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_FloorTile);
- break;
- case METATILE_MauvilleGym_RedBeamV1_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_Off | METATILE_COLLISION_MASK);
- break;
- case METATILE_MauvilleGym_RedBeamV2_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_FloorTile);
- break;
- case METATILE_MauvilleGym_PoleBottom_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamV1_On | METATILE_COLLISION_MASK);
- break;
- case METATILE_MauvilleGym_FloorTile:
- if (MapGridGetMetatileIdAt(x, y - 1) == METATILE_MauvilleGym_GreenBeamV1_On)
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamV2_On | METATILE_COLLISION_MASK);
- else
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamV2_On | METATILE_COLLISION_MASK);
- break;
- case METATILE_MauvilleGym_PoleBottom_Off:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamV1_On | METATILE_COLLISION_MASK);
- break;
- case METATILE_MauvilleGym_PoleTop_Off:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleTop_On | METATILE_COLLISION_MASK);
- break;
- case METATILE_MauvilleGym_PoleTop_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleTop_Off);
- break;
+ case METATILE_MauvilleGym_GreenBeamH1_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH1_Off);
+ break;
+ case METATILE_MauvilleGym_GreenBeamH2_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH2_Off);
+ break;
+ case METATILE_MauvilleGym_GreenBeamH3_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH3_Off);
+ break;
+ case METATILE_MauvilleGym_GreenBeamH4_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH4_Off);
+ break;
+ case METATILE_MauvilleGym_GreenBeamH1_Off:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH1_On);
+ break;
+ case METATILE_MauvilleGym_GreenBeamH2_Off:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH2_On);
+ break;
+ case METATILE_MauvilleGym_GreenBeamH3_Off:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH3_On | METATILE_COLLISION_MASK);
+ break;
+ case METATILE_MauvilleGym_GreenBeamH4_Off:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH4_On | METATILE_COLLISION_MASK);
+ break;
+ case METATILE_MauvilleGym_RedBeamH1_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH1_Off);
+ break;
+ case METATILE_MauvilleGym_RedBeamH2_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH2_Off);
+ break;
+ case METATILE_MauvilleGym_RedBeamH3_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH3_Off);
+ break;
+ case METATILE_MauvilleGym_RedBeamH4_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH4_Off);
+ break;
+ case METATILE_MauvilleGym_RedBeamH1_Off:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH1_On);
+ break;
+ case METATILE_MauvilleGym_RedBeamH2_Off:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH2_On);
+ break;
+ case METATILE_MauvilleGym_RedBeamH3_Off:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH3_On | METATILE_COLLISION_MASK);
+ break;
+ case METATILE_MauvilleGym_RedBeamH4_Off:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH4_On | METATILE_COLLISION_MASK);
+ break;
+ case METATILE_MauvilleGym_GreenBeamV1_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_On | METATILE_COLLISION_MASK);
+ break;
+ case METATILE_MauvilleGym_GreenBeamV2_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_FloorTile);
+ break;
+ case METATILE_MauvilleGym_RedBeamV1_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_Off | METATILE_COLLISION_MASK);
+ break;
+ case METATILE_MauvilleGym_RedBeamV2_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_FloorTile);
+ break;
+ case METATILE_MauvilleGym_PoleBottom_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamV1_On | METATILE_COLLISION_MASK);
+ break;
+ case METATILE_MauvilleGym_FloorTile:
+ if (MapGridGetMetatileIdAt(x, y - 1) == METATILE_MauvilleGym_GreenBeamV1_On)
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamV2_On | METATILE_COLLISION_MASK);
+ else
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamV2_On | METATILE_COLLISION_MASK);
+ break;
+ case METATILE_MauvilleGym_PoleBottom_Off:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamV1_On | METATILE_COLLISION_MASK);
+ break;
+ case METATILE_MauvilleGym_PoleTop_Off:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleTop_On | METATILE_COLLISION_MASK);
+ break;
+ case METATILE_MauvilleGym_PoleTop_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleTop_Off);
+ break;
}
}
}
@@ -763,43 +730,43 @@ void MauvilleGymDeactivatePuzzle(void)
{
switch (MapGridGetMetatileIdAt(x, y))
{
- case METATILE_MauvilleGym_GreenBeamH1_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH1_Off);
- break;
- case METATILE_MauvilleGym_GreenBeamH2_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH2_Off);
- break;
- case METATILE_MauvilleGym_GreenBeamH3_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH3_Off);
- break;
- case METATILE_MauvilleGym_GreenBeamH4_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH4_Off);
- break;
- case METATILE_MauvilleGym_RedBeamH1_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH1_Off);
- break;
- case METATILE_MauvilleGym_RedBeamH2_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH2_Off);
- break;
- case METATILE_MauvilleGym_RedBeamH3_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH3_Off);
- break;
- case METATILE_MauvilleGym_RedBeamH4_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH4_Off);
- break;
- case METATILE_MauvilleGym_GreenBeamV1_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_On | METATILE_COLLISION_MASK);
- break;
- case METATILE_MauvilleGym_RedBeamV1_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_Off | METATILE_COLLISION_MASK);
- break;
- case METATILE_MauvilleGym_GreenBeamV2_On:
- case METATILE_MauvilleGym_RedBeamV2_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_FloorTile);
- break;
- case METATILE_MauvilleGym_PoleTop_On:
- MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleTop_Off);
- break;
+ case METATILE_MauvilleGym_GreenBeamH1_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH1_Off);
+ break;
+ case METATILE_MauvilleGym_GreenBeamH2_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH2_Off);
+ break;
+ case METATILE_MauvilleGym_GreenBeamH3_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH3_Off);
+ break;
+ case METATILE_MauvilleGym_GreenBeamH4_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH4_Off);
+ break;
+ case METATILE_MauvilleGym_RedBeamH1_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH1_Off);
+ break;
+ case METATILE_MauvilleGym_RedBeamH2_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH2_Off);
+ break;
+ case METATILE_MauvilleGym_RedBeamH3_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH3_Off);
+ break;
+ case METATILE_MauvilleGym_RedBeamH4_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH4_Off);
+ break;
+ case METATILE_MauvilleGym_GreenBeamV1_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_On | METATILE_COLLISION_MASK);
+ break;
+ case METATILE_MauvilleGym_RedBeamV1_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_Off | METATILE_COLLISION_MASK);
+ break;
+ case METATILE_MauvilleGym_GreenBeamV2_On:
+ case METATILE_MauvilleGym_RedBeamV2_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_FloorTile);
+ break;
+ case METATILE_MauvilleGym_PoleTop_On:
+ MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleTop_Off);
+ break;
}
}
}
@@ -849,54 +816,54 @@ static void PetalburgGymSetDoorMetatiles(u8 roomNumber, u16 metatileId)
u8 nDoors = 0;
switch (roomNumber)
{
- case 1:
- nDoors = 2;
- doorCoordsX[0] = 1;
- doorCoordsX[1] = 7;
- doorCoordsY[0] = 104;
- doorCoordsY[1] = 104;
- break;
- case 2:
- nDoors = 2;
- doorCoordsX[0] = 1;
- doorCoordsX[1] = 7;
- doorCoordsY[0] = 78;
- doorCoordsY[1] = 78;
- break;
- case 3:
- nDoors = 2;
- doorCoordsX[0] = 1;
- doorCoordsX[1] = 7;
- doorCoordsY[0] = 91;
- doorCoordsY[1] = 91;
- break;
- case 4:
- nDoors = 1;
- doorCoordsX[0] = 7;
- doorCoordsY[0] = 39;
- break;
- case 5:
- nDoors = 2;
- doorCoordsX[0] = 1;
- doorCoordsX[1] = 7;
- doorCoordsY[0] = 52;
- doorCoordsY[1] = 52;
- break;
- case 6:
- nDoors = 1;
- doorCoordsX[0] = 1;
- doorCoordsY[0] = 65;
- break;
- case 7:
- nDoors = 1;
- doorCoordsX[0] = 7;
- doorCoordsY[0] = 13;
- break;
- case 8:
- nDoors = 1;
- doorCoordsX[0] = 1;
- doorCoordsY[0] = 26;
- break;
+ case 1:
+ nDoors = 2;
+ doorCoordsX[0] = 1;
+ doorCoordsX[1] = 7;
+ doorCoordsY[0] = 104;
+ doorCoordsY[1] = 104;
+ break;
+ case 2:
+ nDoors = 2;
+ doorCoordsX[0] = 1;
+ doorCoordsX[1] = 7;
+ doorCoordsY[0] = 78;
+ doorCoordsY[1] = 78;
+ break;
+ case 3:
+ nDoors = 2;
+ doorCoordsX[0] = 1;
+ doorCoordsX[1] = 7;
+ doorCoordsY[0] = 91;
+ doorCoordsY[1] = 91;
+ break;
+ case 4:
+ nDoors = 1;
+ doorCoordsX[0] = 7;
+ doorCoordsY[0] = 39;
+ break;
+ case 5:
+ nDoors = 2;
+ doorCoordsX[0] = 1;
+ doorCoordsX[1] = 7;
+ doorCoordsY[0] = 52;
+ doorCoordsY[1] = 52;
+ break;
+ case 6:
+ nDoors = 1;
+ doorCoordsX[0] = 1;
+ doorCoordsY[0] = 65;
+ break;
+ case 7:
+ nDoors = 1;
+ doorCoordsX[0] = 7;
+ doorCoordsY[0] = 13;
+ break;
+ case 8:
+ nDoors = 1;
+ doorCoordsX[0] = 1;
+ doorCoordsY[0] = 26;
+ break;
}
for (i = 0; i < nDoors; i++)
{
@@ -930,25 +897,17 @@ u8 GetPlayerTrainerIdOnesDigit(void)
void GetPlayerBigGuyGirlString(void)
{
if (gSaveBlock2Ptr->playerGender == MALE)
- {
StringCopy(gStringVar1, gText_BigGuy);
- }
else
- {
StringCopy(gStringVar1, gText_BigGirl);
- }
}
void GetRivalSonDaughterString(void)
{
if (gSaveBlock2Ptr->playerGender == MALE)
- {
StringCopy(gStringVar1, gText_Daughter);
- }
else
- {
StringCopy(gStringVar1, gText_Son);
- }
}
u8 GetBattleOutcome(void)
@@ -983,29 +942,18 @@ u8 GetLeadMonFriendshipScore(void)
{
struct Pokemon *pokemon = &gPlayerParty[GetLeadMonIndex()];
if (GetMonData(pokemon, MON_DATA_FRIENDSHIP) == MAX_FRIENDSHIP)
- {
return 6;
- }
if (GetMonData(pokemon, MON_DATA_FRIENDSHIP) >= 200)
- {
return 5;
- }
if (GetMonData(pokemon, MON_DATA_FRIENDSHIP) >= 150)
- {
return 4;
- }
if (GetMonData(pokemon, MON_DATA_FRIENDSHIP) >= 100)
- {
return 3;
- }
if (GetMonData(pokemon, MON_DATA_FRIENDSHIP) >= 50)
- {
return 2;
- }
if (GetMonData(pokemon, MON_DATA_FRIENDSHIP) >= 1)
- {
return 1;
- }
+
return 0;
}
@@ -1036,9 +984,7 @@ static void Task_PCTurnOnEffect(u8 taskId)
{
struct Task *task = &gTasks[taskId];
if (task->data[0] == 0)
- {
PCTurnOnEffect_0(task);
- }
}
static void PCTurnOnEffect_0(struct Task *task)
@@ -1052,26 +998,24 @@ static void PCTurnOnEffect_0(struct Task *task)
playerDirection = GetPlayerFacingDirection();
switch (playerDirection)
{
- case DIR_NORTH:
- dx = 0;
- dy = -1;
- break;
- case DIR_WEST:
- dx = -1;
- dy = -1;
- break;
- case DIR_EAST:
- dx = 1;
- dy = -1;
- break;
+ case DIR_NORTH:
+ dx = 0;
+ dy = -1;
+ break;
+ case DIR_WEST:
+ dx = -1;
+ dy = -1;
+ break;
+ case DIR_EAST:
+ dx = 1;
+ dy = -1;
+ break;
}
PCTurnOnEffect_1(task->data[4], dx, dy);
DrawWholeMapView();
task->data[4] ^= 1;
if ((++task->data[2]) == 5)
- {
DestroyTask(task->data[1]);
- }
}
task->data[3]++;
}
@@ -1082,32 +1026,20 @@ static void PCTurnOnEffect_1(s16 isPcTurnedOn, s8 dx, s8 dy)
if (isPcTurnedOn)
{
if (gSpecialVar_0x8004 == PC_LOCATION_OTHER)
- {
tileId = METATILE_Building_PC_Off;
- }
else if (gSpecialVar_0x8004 == PC_LOCATION_BRENDANS_HOUSE)
- {
tileId = METATILE_BrendansMaysHouse_BrendanPC_Off;
- }
else if (gSpecialVar_0x8004 == PC_LOCATION_MAYS_HOUSE)
- {
tileId = METATILE_BrendansMaysHouse_MayPC_Off;
- }
}
else
{
if (gSpecialVar_0x8004 == PC_LOCATION_OTHER)
- {
tileId = METATILE_Building_PC_On;
- }
else if (gSpecialVar_0x8004 == PC_LOCATION_BRENDANS_HOUSE)
- {
tileId = METATILE_BrendansMaysHouse_BrendanPC_On;
- }
else if (gSpecialVar_0x8004 == PC_LOCATION_MAYS_HOUSE)
- {
tileId = METATILE_BrendansMaysHouse_MayPC_On;
- }
}
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + MAP_OFFSET, gSaveBlock1Ptr->pos.y + dy + MAP_OFFSET, tileId | METATILE_COLLISION_MASK);
}
@@ -1125,31 +1057,25 @@ static void PCTurnOffEffect(void)
u8 playerDirection = GetPlayerFacingDirection();
switch (playerDirection)
{
- case DIR_NORTH:
- dx = 0;
- dy = -1;
- break;
- case DIR_WEST:
- dx = -1;
- dy = -1;
- break;
- case DIR_EAST:
- dx = 1;
- dy = -1;
- break;
+ case DIR_NORTH:
+ dx = 0;
+ dy = -1;
+ break;
+ case DIR_WEST:
+ dx = -1;
+ dy = -1;
+ break;
+ case DIR_EAST:
+ dx = 1;
+ dy = -1;
+ break;
}
if (gSpecialVar_0x8004 == 0)
- {
tileId = METATILE_Building_PC_Off;
- }
else if (gSpecialVar_0x8004 == 1)
- {
tileId = METATILE_BrendansMaysHouse_BrendanPC_Off;
- }
else if (gSpecialVar_0x8004 == 2)
- {
tileId = METATILE_BrendansMaysHouse_MayPC_Off;
- }
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + MAP_OFFSET, gSaveBlock1Ptr->pos.y + dy + MAP_OFFSET, tileId | METATILE_COLLISION_MASK);
DrawWholeMapView();
}
@@ -1171,9 +1097,7 @@ static void Task_LotteryCornerComputerEffect(u8 taskId)
{
struct Task *task = &gTasks[taskId];
if (task->data[0] == 0)
- {
LotteryCornerComputerEffect(task);
- }
}
static void LotteryCornerComputerEffect(struct Task *task)
@@ -1194,9 +1118,7 @@ static void LotteryCornerComputerEffect(struct Task *task)
DrawWholeMapView();
task->data[4] ^= 1;
if ((++task->data[2]) == 5)
- {
DestroyTask(task->data[1]);
- }
}
task->data[3]++;
}
@@ -1227,45 +1149,40 @@ void ResetTrickHouseNuggetFlag(void)
bool8 CheckLeadMonCool(void)
{
if (GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_COOL) < 200)
- {
return FALSE;
- }
+
return TRUE;
}
bool8 CheckLeadMonBeauty(void)
{
if (GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_BEAUTY) < 200)
- {
return FALSE;
- }
+
return TRUE;
}
bool8 CheckLeadMonCute(void)
{
if (GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_CUTE) < 200)
- {
return FALSE;
- }
+
return TRUE;
}
bool8 CheckLeadMonSmart(void)
{
if (GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_SMART) < 200)
- {
return FALSE;
- }
+
return TRUE;
}
bool8 CheckLeadMonTough(void)
{
if (GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_TOUGH) < 200)
- {
return FALSE;
- }
+
return TRUE;
}
@@ -1373,9 +1290,8 @@ bool8 FoundAbandonedShipRoom1Key(void)
u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY;
*specVar = flag;
if (!FlagGet(flag))
- {
return FALSE;
- }
+
return TRUE;
}
@@ -1385,9 +1301,8 @@ bool8 FoundAbandonedShipRoom2Key(void)
u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY;
*specVar = flag;
if (!FlagGet(flag))
- {
return FALSE;
- }
+
return TRUE;
}
@@ -1397,9 +1312,8 @@ bool8 FoundAbandonedShipRoom4Key(void)
u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY;
*specVar = flag;
if (!FlagGet(flag))
- {
return FALSE;
- }
+
return TRUE;
}
@@ -1409,9 +1323,8 @@ bool8 FoundAbandonedShipRoom6Key(void)
u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY;
*specVar = flag;
if (!FlagGet(flag))
- {
return FALSE;
- }
+
return TRUE;
}
@@ -1430,17 +1343,14 @@ void GiveLeadMonEffortRibbon(void)
leadMon = &gPlayerParty[GetLeadMonIndex()];
SetMonData(leadMon, MON_DATA_EFFORT_RIBBON, &ribbonSet);
if (GetRibbonCount(leadMon) > NUM_CUTIES_RIBBONS)
- {
TryPutSpotTheCutiesOnAir(leadMon, MON_DATA_EFFORT_RIBBON);
- }
}
bool8 Special_AreLeadMonEVsMaxedOut(void)
{
if (GetMonEVCount(&gPlayerParty[GetLeadMonIndex()]) >= MAX_TOTAL_EVS)
- {
return TRUE;
- }
+
return FALSE;
}
@@ -1491,9 +1401,7 @@ bool8 IsStarterInParty(void)
for (i = 0; i < partyCount; i++)
{
if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL) == starter)
- {
return TRUE;
- }
}
return FALSE;
}
@@ -1506,9 +1414,8 @@ bool8 ScriptCheckFreePokemonStorageSpace(void)
bool8 IsPokerusInParty(void)
{
if (!CheckPartyPokerus(gPlayerParty, 0x3f))
- {
return FALSE;
- }
+
return TRUE;
}
@@ -1586,9 +1493,7 @@ u8 GetLeadMonIndex(void)
for (i = 0; i < partyCount; i++)
{
if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL) != SPECIES_EGG && GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL) != 0)
- {
return i;
- }
}
return 0;
}
@@ -1608,13 +1513,10 @@ u16 GetDaysUntilPacifidlogTMAvailable(void)
{
u16 tmReceivedDay = VarGet(VAR_PACIFIDLOG_TM_RECEIVED_DAY);
if (gLocalTime.days - tmReceivedDay >= 7)
- {
return 0;
- }
else if (gLocalTime.days < 0)
- {
return 8;
- }
+
return 7 - (gLocalTime.days - tmReceivedDay);
}
@@ -1675,18 +1577,18 @@ u16 GetMysteryGiftCardStat(void)
{
switch (gSpecialVar_Result)
{
- case GET_NUM_STAMPS:
- return MysteryGift_GetCardStat(CARD_STAT_NUM_STAMPS);
- case GET_MAX_STAMPS:
- return MysteryGift_GetCardStat(CARD_STAT_MAX_STAMPS);
- case GET_CARD_BATTLES_WON:
- return MysteryGift_GetCardStat(CARD_STAT_BATTLES_WON);
- case GET_CARD_BATTLES_LOST: // Never occurs
- return MysteryGift_GetCardStat(CARD_STAT_BATTLES_LOST);
- case GET_CARD_NUM_TRADES: // Never occurs
- return MysteryGift_GetCardStat(CARD_STAT_NUM_TRADES);
- default:
- return 0;
+ case GET_NUM_STAMPS:
+ return MysteryGift_GetCardStat(CARD_STAT_NUM_STAMPS);
+ case GET_MAX_STAMPS:
+ return MysteryGift_GetCardStat(CARD_STAT_MAX_STAMPS);
+ case GET_CARD_BATTLES_WON:
+ return MysteryGift_GetCardStat(CARD_STAT_BATTLES_WON);
+ case GET_CARD_BATTLES_LOST: // Never occurs
+ return MysteryGift_GetCardStat(CARD_STAT_BATTLES_LOST);
+ case GET_CARD_NUM_TRADES: // Never occurs
+ return MysteryGift_GetCardStat(CARD_STAT_NUM_TRADES);
+ default:
+ return 0;
}
}
@@ -1804,27 +1706,27 @@ void SetDeptStoreFloor(void)
u8 deptStoreFloor;
switch (gSaveBlock1Ptr->dynamicWarp.mapNum)
{
- case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_1F):
- deptStoreFloor = DEPT_STORE_FLOORNUM_1F;
- break;
- case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_2F):
- deptStoreFloor = DEPT_STORE_FLOORNUM_2F;
- break;
- case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_3F):
- deptStoreFloor = DEPT_STORE_FLOORNUM_3F;
- break;
- case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_4F):
- deptStoreFloor = DEPT_STORE_FLOORNUM_4F;
- break;
- case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_5F):
- deptStoreFloor = DEPT_STORE_FLOORNUM_5F;
- break;
- case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP):
- deptStoreFloor = DEPT_STORE_FLOORNUM_ROOFTOP;
- break;
- default:
- deptStoreFloor = DEPT_STORE_FLOORNUM_1F;
- break;
+ case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_1F):
+ deptStoreFloor = DEPT_STORE_FLOORNUM_1F;
+ break;
+ case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_2F):
+ deptStoreFloor = DEPT_STORE_FLOORNUM_2F;
+ break;
+ case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_3F):
+ deptStoreFloor = DEPT_STORE_FLOORNUM_3F;
+ break;
+ case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_4F):
+ deptStoreFloor = DEPT_STORE_FLOORNUM_4F;
+ break;
+ case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_5F):
+ deptStoreFloor = DEPT_STORE_FLOORNUM_5F;
+ break;
+ case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP):
+ deptStoreFloor = DEPT_STORE_FLOORNUM_ROOFTOP;
+ break;
+ default:
+ deptStoreFloor = DEPT_STORE_FLOORNUM_1F;
+ break;
}
VarSet(VAR_DEPT_STORE_FLOOR, deptStoreFloor);
}
@@ -1838,26 +1740,26 @@ u16 GetDeptStoreDefaultFloorChoice(void)
{
switch (gSaveBlock1Ptr->dynamicWarp.mapNum)
{
- case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_5F):
- sLilycoveDeptStore_NeverRead = 0;
- sLilycoveDeptStore_DefaultFloorChoice = 0;
- break;
- case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_4F):
- sLilycoveDeptStore_NeverRead = 0;
- sLilycoveDeptStore_DefaultFloorChoice = 1;
- break;
- case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_3F):
- sLilycoveDeptStore_NeverRead = 0;
- sLilycoveDeptStore_DefaultFloorChoice = 2;
- break;
- case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_2F):
- sLilycoveDeptStore_NeverRead = 0;
- sLilycoveDeptStore_DefaultFloorChoice = 3;
- break;
- case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_1F):
- sLilycoveDeptStore_NeverRead = 0;
- sLilycoveDeptStore_DefaultFloorChoice = 4;
- break;
+ case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_5F):
+ sLilycoveDeptStore_NeverRead = 0;
+ sLilycoveDeptStore_DefaultFloorChoice = 0;
+ break;
+ case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_4F):
+ sLilycoveDeptStore_NeverRead = 0;
+ sLilycoveDeptStore_DefaultFloorChoice = 1;
+ break;
+ case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_3F):
+ sLilycoveDeptStore_NeverRead = 0;
+ sLilycoveDeptStore_DefaultFloorChoice = 2;
+ break;
+ case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_2F):
+ sLilycoveDeptStore_NeverRead = 0;
+ sLilycoveDeptStore_DefaultFloorChoice = 3;
+ break;
+ case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_1F):
+ sLilycoveDeptStore_NeverRead = 0;
+ sLilycoveDeptStore_DefaultFloorChoice = 4;
+ break;
}
}
@@ -1969,22 +1871,24 @@ static void Task_MoveElevatorWindowLights(u8 taskId)
if (data[2] == FALSE)
{
for (y = 0; y < 3; y++)
+ {
for (x = 0; x < 3; x++)
MapGridSetMetatileIdAt(x + MAP_OFFSET + 1, y + MAP_OFFSET, sElevatorWindowTiles_Ascending[y][data[0] % 3] | METATILE_COLLISION_MASK);
+ }
}
// descending
else
{
for (y = 0; y < 3; y++)
+ {
for (x = 0; x < 3; x++)
MapGridSetMetatileIdAt(x + MAP_OFFSET + 1, y + MAP_OFFSET, sElevatorWindowTiles_Descending[y][data[0] % 3] | METATILE_COLLISION_MASK);
+ }
}
DrawWholeMapView();
data[1] = 0;
if (data[0] == data[3])
- {
DestroyTask(taskId);
- }
}
data[1]++;
}
@@ -2004,9 +1908,7 @@ void BufferVarsForIVRater(void)
gSpecialVar_0x8005 = 0;
for (i = 0; i < NUM_STATS; i++)
- {
gSpecialVar_0x8005 += ivStorage[i];
- }
gSpecialVar_0x8006 = 0;
gSpecialVar_0x8007 = ivStorage[STAT_HP];
@@ -2070,9 +1972,8 @@ bool8 UsedPokemonCenterWarp(void)
bool32 PlayerNotAtTrainerHillEntrance(void)
{
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_HILL_ENTRANCE) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_HILL_ENTRANCE))
- {
return FALSE;
- }
+
return TRUE;
}
@@ -2169,86 +2070,58 @@ void ShowFrontierManiacMessage(void)
switch (facility)
{
- case FRONTIER_MANIAC_TOWER_SINGLES:
- case FRONTIER_MANIAC_TOWER_DOUBLES:
- case FRONTIER_MANIAC_TOWER_MULTIS:
- case FRONTIER_MANIAC_TOWER_LINK:
- if (gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_50]
- >= gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_OPEN])
- {
- winStreak = gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_50];
- }
- else
- {
- winStreak = gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_OPEN];
- }
- break;
- case FRONTIER_MANIAC_DOME:
- if (gSaveBlock2Ptr->frontier.domeWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50]
- >= gSaveBlock2Ptr->frontier.domeWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN])
- {
- winStreak = gSaveBlock2Ptr->frontier.domeWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50];
- }
- else
- {
- winStreak = gSaveBlock2Ptr->frontier.domeWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN];
- }
- break;
- case FRONTIER_MANIAC_FACTORY:
- if (gSaveBlock2Ptr->frontier.factoryWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50]
- >= gSaveBlock2Ptr->frontier.factoryWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN])
- {
- winStreak = gSaveBlock2Ptr->frontier.factoryWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50];
- }
- else
- {
- winStreak = gSaveBlock2Ptr->frontier.factoryWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN];
- }
- break;
- case FRONTIER_MANIAC_PALACE:
- if (gSaveBlock2Ptr->frontier.palaceWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50]
- >= gSaveBlock2Ptr->frontier.palaceWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN])
- {
- winStreak = gSaveBlock2Ptr->frontier.palaceWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50];
- }
- else
- {
- winStreak = gSaveBlock2Ptr->frontier.palaceWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN];
- }
- break;
- case FRONTIER_MANIAC_ARENA:
- if (gSaveBlock2Ptr->frontier.arenaWinStreaks[FRONTIER_LVL_50]
- >= gSaveBlock2Ptr->frontier.arenaWinStreaks[FRONTIER_LVL_OPEN])
- {
- winStreak = gSaveBlock2Ptr->frontier.arenaWinStreaks[FRONTIER_LVL_50];
- }
- else
- {
- winStreak = gSaveBlock2Ptr->frontier.arenaWinStreaks[FRONTIER_LVL_OPEN];
- }
- break;
- case FRONTIER_MANIAC_PIKE:
- if (gSaveBlock2Ptr->frontier.pikeWinStreaks[FRONTIER_LVL_50]
- >= gSaveBlock2Ptr->frontier.pikeWinStreaks[FRONTIER_LVL_OPEN])
- {
- winStreak = gSaveBlock2Ptr->frontier.pikeWinStreaks[FRONTIER_LVL_50];
- }
- else
- {
- winStreak = gSaveBlock2Ptr->frontier.pikeWinStreaks[FRONTIER_LVL_OPEN];
- }
- break;
- case FRONTIER_MANIAC_PYRAMID:
- if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[FRONTIER_LVL_50]
- >= gSaveBlock2Ptr->frontier.pyramidWinStreaks[FRONTIER_LVL_OPEN])
- {
- winStreak = gSaveBlock2Ptr->frontier.pyramidWinStreaks[FRONTIER_LVL_50];
- }
- else
- {
- winStreak = gSaveBlock2Ptr->frontier.pyramidWinStreaks[FRONTIER_LVL_OPEN];
- }
- break;
+ case FRONTIER_MANIAC_TOWER_SINGLES:
+ case FRONTIER_MANIAC_TOWER_DOUBLES:
+ case FRONTIER_MANIAC_TOWER_MULTIS:
+ case FRONTIER_MANIAC_TOWER_LINK:
+ if (gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_50]
+ >= gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_OPEN])
+ winStreak = gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_50];
+ else
+ winStreak = gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_OPEN];
+ break;
+ case FRONTIER_MANIAC_DOME:
+ if (gSaveBlock2Ptr->frontier.domeWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50]
+ >= gSaveBlock2Ptr->frontier.domeWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN])
+ winStreak = gSaveBlock2Ptr->frontier.domeWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50];
+ else
+ winStreak = gSaveBlock2Ptr->frontier.domeWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN];
+ break;
+ case FRONTIER_MANIAC_FACTORY:
+ if (gSaveBlock2Ptr->frontier.factoryWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50]
+ >= gSaveBlock2Ptr->frontier.factoryWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN])
+ winStreak = gSaveBlock2Ptr->frontier.factoryWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50];
+ else
+ winStreak = gSaveBlock2Ptr->frontier.factoryWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN];
+ break;
+ case FRONTIER_MANIAC_PALACE:
+ if (gSaveBlock2Ptr->frontier.palaceWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50]
+ >= gSaveBlock2Ptr->frontier.palaceWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN])
+ winStreak = gSaveBlock2Ptr->frontier.palaceWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50];
+ else
+ winStreak = gSaveBlock2Ptr->frontier.palaceWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN];
+ break;
+ case FRONTIER_MANIAC_ARENA:
+ if (gSaveBlock2Ptr->frontier.arenaWinStreaks[FRONTIER_LVL_50]
+ >= gSaveBlock2Ptr->frontier.arenaWinStreaks[FRONTIER_LVL_OPEN])
+ winStreak = gSaveBlock2Ptr->frontier.arenaWinStreaks[FRONTIER_LVL_50];
+ else
+ winStreak = gSaveBlock2Ptr->frontier.arenaWinStreaks[FRONTIER_LVL_OPEN];
+ break;
+ case FRONTIER_MANIAC_PIKE:
+ if (gSaveBlock2Ptr->frontier.pikeWinStreaks[FRONTIER_LVL_50]
+ >= gSaveBlock2Ptr->frontier.pikeWinStreaks[FRONTIER_LVL_OPEN])
+ winStreak = gSaveBlock2Ptr->frontier.pikeWinStreaks[FRONTIER_LVL_50];
+ else
+ winStreak = gSaveBlock2Ptr->frontier.pikeWinStreaks[FRONTIER_LVL_OPEN];
+ break;
+ case FRONTIER_MANIAC_PYRAMID:
+ if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[FRONTIER_LVL_50]
+ >= gSaveBlock2Ptr->frontier.pyramidWinStreaks[FRONTIER_LVL_OPEN])
+ winStreak = gSaveBlock2Ptr->frontier.pyramidWinStreaks[FRONTIER_LVL_50];
+ else
+ winStreak = gSaveBlock2Ptr->frontier.pyramidWinStreaks[FRONTIER_LVL_OPEN];
+ break;
}
for (i = 0; i < FRONTIER_MANIAC_MESSAGE_COUNT - 1 && sFrontierManiacStreakThresholds[facility][i] < winStreak; i++);
@@ -2313,131 +2186,131 @@ void ShowScrollableMultichoice(void)
switch (gSpecialVar_0x8004)
{
- case SCROLL_MULTI_NONE:
- task->tMaxItemsOnScreen = 1;
- task->tNumItems = 1;
- task->tLeft = 1;
- task->tTop = 1;
- task->tWidth = 1;
- task->tHeight = 1;
- task->tKeepOpenAfterSelect = FALSE;
- task->tTaskId = taskId;
- break;
- case SCROLL_MULTI_GLASS_WORKSHOP_VENDOR:
- task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN - 1;
- task->tNumItems = 8;
- task->tLeft = 1;
- task->tTop = 1;
- task->tWidth = 9;
- task->tHeight = 10;
- task->tKeepOpenAfterSelect = FALSE;
- task->tTaskId = taskId;
- break;
- case SCROLL_MULTI_POKEMON_FAN_CLUB_RATER:
- task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
- task->tNumItems = 12;
- task->tLeft = 1;
- task->tTop = 1;
- task->tWidth = 7;
- task->tHeight = 12;
- task->tKeepOpenAfterSelect = FALSE;
- task->tTaskId = taskId;
- break;
- case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1:
- task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
- task->tNumItems = 11;
- task->tLeft = 14;
- task->tTop = 1;
- task->tWidth = 15;
- task->tHeight = 12;
- task->tKeepOpenAfterSelect = FALSE;
- task->tTaskId = taskId;
- break;
- case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2:
- task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
- task->tNumItems = 6;
- task->tLeft = 14;
- task->tTop = 1;
- task->tWidth = 15;
- task->tHeight = 12;
- task->tKeepOpenAfterSelect = FALSE;
- task->tTaskId = taskId;
- break;
- case SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR:
- task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
- task->tNumItems = 7;
- task->tLeft = 14;
- task->tTop = 1;
- task->tWidth = 15;
- task->tHeight = 12;
- task->tKeepOpenAfterSelect = FALSE;
- task->tTaskId = taskId;
- break;
- case SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR:
- task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
- task->tNumItems = 10;
- task->tLeft = 14;
- task->tTop = 1;
- task->tWidth = 15;
- task->tHeight = 12;
- task->tKeepOpenAfterSelect = FALSE;
- task->tTaskId = taskId;
- break;
- case SCROLL_MULTI_BERRY_POWDER_VENDOR:
- task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
- task->tNumItems = 12;
- task->tLeft = 15;
- task->tTop = 1;
- task->tWidth = 14;
- task->tHeight = 12;
- task->tKeepOpenAfterSelect = FALSE;
- task->tTaskId = taskId;
- break;
- case SCROLL_MULTI_BF_RECEPTIONIST:
- task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
- task->tNumItems = 10;
- task->tLeft = 17;
- task->tTop = 1;
- task->tWidth = 11;
- task->tHeight = 12;
- task->tKeepOpenAfterSelect = FALSE;
- task->tTaskId = taskId;
- break;
- case SCROLL_MULTI_BF_MOVE_TUTOR_1:
- case SCROLL_MULTI_BF_MOVE_TUTOR_2:
- task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
- task->tNumItems = 11;
- task->tLeft = 15;
- task->tTop = 1;
- task->tWidth = 14;
- task->tHeight = 12;
- task->tKeepOpenAfterSelect = FALSE;
- task->tTaskId = taskId;
- break;
- case SCROLL_MULTI_SS_TIDAL_DESTINATION:
- task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
- task->tNumItems = 7;
- task->tLeft = 19;
- task->tTop = 1;
- task->tWidth = 10;
- task->tHeight = 12;
- task->tKeepOpenAfterSelect = FALSE;
- task->tTaskId = taskId;
- break;
- case SCROLL_MULTI_BATTLE_TENT_RULES:
- task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
- task->tNumItems = 7;
- task->tLeft = 17;
- task->tTop = 1;
- task->tWidth = 12;
- task->tHeight = 12;
- task->tKeepOpenAfterSelect = FALSE;
- task->tTaskId = taskId;
- break;
- default:
- gSpecialVar_Result = MULTI_B_PRESSED;
- DestroyTask(taskId);
- break;
+ case SCROLL_MULTI_NONE:
+ task->tMaxItemsOnScreen = 1;
+ task->tNumItems = 1;
+ task->tLeft = 1;
+ task->tTop = 1;
+ task->tWidth = 1;
+ task->tHeight = 1;
+ task->tKeepOpenAfterSelect = FALSE;
+ task->tTaskId = taskId;
+ break;
+ case SCROLL_MULTI_GLASS_WORKSHOP_VENDOR:
+ task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN - 1;
+ task->tNumItems = 8;
+ task->tLeft = 1;
+ task->tTop = 1;
+ task->tWidth = 9;
+ task->tHeight = 10;
+ task->tKeepOpenAfterSelect = FALSE;
+ task->tTaskId = taskId;
+ break;
+ case SCROLL_MULTI_POKEMON_FAN_CLUB_RATER:
+ task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
+ task->tNumItems = 12;
+ task->tLeft = 1;
+ task->tTop = 1;
+ task->tWidth = 7;
+ task->tHeight = 12;
+ task->tKeepOpenAfterSelect = FALSE;
+ task->tTaskId = taskId;
+ break;
+ case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1:
+ task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
+ task->tNumItems = 11;
+ task->tLeft = 14;
+ task->tTop = 1;
+ task->tWidth = 15;
+ task->tHeight = 12;
+ task->tKeepOpenAfterSelect = FALSE;
+ task->tTaskId = taskId;
+ break;
+ case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2:
+ task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
+ task->tNumItems = 6;
+ task->tLeft = 14;
+ task->tTop = 1;
+ task->tWidth = 15;
+ task->tHeight = 12;
+ task->tKeepOpenAfterSelect = FALSE;
+ task->tTaskId = taskId;
+ break;
+ case SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR:
+ task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
+ task->tNumItems = 7;
+ task->tLeft = 14;
+ task->tTop = 1;
+ task->tWidth = 15;
+ task->tHeight = 12;
+ task->tKeepOpenAfterSelect = FALSE;
+ task->tTaskId = taskId;
+ break;
+ case SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR:
+ task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
+ task->tNumItems = 10;
+ task->tLeft = 14;
+ task->tTop = 1;
+ task->tWidth = 15;
+ task->tHeight = 12;
+ task->tKeepOpenAfterSelect = FALSE;
+ task->tTaskId = taskId;
+ break;
+ case SCROLL_MULTI_BERRY_POWDER_VENDOR:
+ task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
+ task->tNumItems = 12;
+ task->tLeft = 15;
+ task->tTop = 1;
+ task->tWidth = 14;
+ task->tHeight = 12;
+ task->tKeepOpenAfterSelect = FALSE;
+ task->tTaskId = taskId;
+ break;
+ case SCROLL_MULTI_BF_RECEPTIONIST:
+ task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
+ task->tNumItems = 10;
+ task->tLeft = 17;
+ task->tTop = 1;
+ task->tWidth = 11;
+ task->tHeight = 12;
+ task->tKeepOpenAfterSelect = FALSE;
+ task->tTaskId = taskId;
+ break;
+ case SCROLL_MULTI_BF_MOVE_TUTOR_1:
+ case SCROLL_MULTI_BF_MOVE_TUTOR_2:
+ task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
+ task->tNumItems = 11;
+ task->tLeft = 15;
+ task->tTop = 1;
+ task->tWidth = 14;
+ task->tHeight = 12;
+ task->tKeepOpenAfterSelect = FALSE;
+ task->tTaskId = taskId;
+ break;
+ case SCROLL_MULTI_SS_TIDAL_DESTINATION:
+ task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
+ task->tNumItems = 7;
+ task->tLeft = 19;
+ task->tTop = 1;
+ task->tWidth = 10;
+ task->tHeight = 12;
+ task->tKeepOpenAfterSelect = FALSE;
+ task->tTaskId = taskId;
+ break;
+ case SCROLL_MULTI_BATTLE_TENT_RULES:
+ task->tMaxItemsOnScreen = MAX_SCROLL_MULTI_ON_SCREEN;
+ task->tNumItems = 7;
+ task->tLeft = 17;
+ task->tTop = 1;
+ task->tWidth = 12;
+ task->tHeight = 12;
+ task->tKeepOpenAfterSelect = FALSE;
+ task->tTaskId = taskId;
+ break;
+ default:
+ gSpecialVar_Result = MULTI_B_PRESSED;
+ DestroyTask(taskId);
+ break;
}
}
@@ -2627,13 +2500,9 @@ static void Task_ShowScrollableMultichoice(u8 taskId)
{
int adjustedLeft = MAX_MULTICHOICE_WIDTH + 1 - task->tWidth;
if (adjustedLeft < 0)
- {
task->tLeft = 0;
- }
else
- {
task->tLeft = adjustedLeft;
- }
}
template = CreateWindowTemplate(0, task->tLeft, task->tTop, task->tWidth, task->tHeight, 0xF, 0x64);
@@ -2713,13 +2582,14 @@ static void ScrollableMultichoice_ProcessInput(u8 taskId)
{
CloseScrollableMultichoice(taskId);
}
- // if selected option was the last one (Exit)
else if (input == task->tNumItems - 1)
{
+ // Selected option was the last one (Exit)
CloseScrollableMultichoice(taskId);
}
- else // Handle selection while keeping the menu open
+ else
{
+ // Handle selection while keeping the menu open
ScrollableMultichoice_RemoveScrollArrows(taskId);
task->func = Task_ScrollableMultichoice_WaitReturnToList;
EnableBothScriptContexts();
@@ -2828,13 +2698,9 @@ void SetBattleTowerLinkPlayerGfx(void)
for (i = 0; i < 2; i++)
{
if (gLinkPlayers[i].gender == MALE)
- {
VarSet(VAR_OBJ_GFX_ID_F - i, OBJ_EVENT_GFX_BRENDAN_NORMAL);
- }
else
- {
VarSet(VAR_OBJ_GFX_ID_F - i, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL);
- }
}
}
@@ -2871,9 +2737,7 @@ void ShowNatureGirlMessage(void)
u8 nature;
if (gSpecialVar_0x8004 >= PARTY_SIZE)
- {
gSpecialVar_0x8004 = 0;
- }
nature = GetNature(&gPlayerParty[gSpecialVar_0x8004]);
ShowFieldMessage(sNatureGirlMessages[nature]);
@@ -2957,13 +2821,9 @@ void FrontierGamblerSetWonOrLost(bool8 won)
if (sFrontierChallenges[challenge] == FRONTIER_CHALLENGE(frontierFacilityId, battleMode))
{
if (won)
- {
VarSet(VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WON);
- }
else
- {
VarSet(VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_LOST);
- }
}
}
}
@@ -2979,7 +2839,8 @@ void UpdateBattlePointsWindow(void)
void ShowBattlePointsWindow(void)
{
- static const struct WindowTemplate sBattlePoints_WindowTemplate = {
+ static const struct WindowTemplate sBattlePoints_WindowTemplate =
+ {
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 1,
@@ -3024,7 +2885,8 @@ u16 GetFrontierBattlePoints(void)
void ShowFrontierExchangeCornerItemIconWindow(void)
{
- static const struct WindowTemplate sFrontierExchangeCorner_ItemIconWindowTemplate = {
+ static const struct WindowTemplate sFrontierExchangeCorner_ItemIconWindowTemplate =
+ {
.bg = 0,
.tilemapLeft = 2,
.tilemapTop = 9,
@@ -3056,40 +2918,40 @@ static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection)
FillWindowPixelRect(0, PIXEL_FILL(1), 0, 0, 216, 32);
switch (menu)
{
- case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1:
- AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_Decor1Descriptions[selection], 0, NULL, 2, 1, 3);
- if (sFrontierExchangeCorner_Decor1[selection] == 0xFFFF)
- {
- ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Decor1[selection]);
- }
- else
- {
- FreeSpriteTilesByTag(TAG_ITEM_ICON);
- FreeSpritePaletteByTag(TAG_ITEM_ICON);
- sScrollableMultichoice_ItemSpriteId = AddDecorationIconObject(sFrontierExchangeCorner_Decor1[selection], 33, 88, 0, TAG_ITEM_ICON, TAG_ITEM_ICON);
- }
- break;
- case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2:
- AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_Decor2Descriptions[selection], 0, NULL, 2, 1, 3);
- if (sFrontierExchangeCorner_Decor2[selection] == 0xFFFF)
- {
- ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Decor2[selection]);
- }
- else
- {
- FreeSpriteTilesByTag(TAG_ITEM_ICON);
- FreeSpritePaletteByTag(TAG_ITEM_ICON);
- sScrollableMultichoice_ItemSpriteId = AddDecorationIconObject(sFrontierExchangeCorner_Decor2[selection], 33, 88, 0, TAG_ITEM_ICON, TAG_ITEM_ICON);
- }
- break;
- case SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR:
- AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_VitaminsDescriptions[selection], 0, NULL, 2, 1, 3);
- ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Vitamins[selection]);
- break;
- case SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR:
- AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_HoldItemsDescriptions[selection], 0, NULL, 2, 1, 3);
- ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_HoldItems[selection]);
- break;
+ case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1:
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_Decor1Descriptions[selection], 0, NULL, 2, 1, 3);
+ if (sFrontierExchangeCorner_Decor1[selection] == 0xFFFF)
+ {
+ ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Decor1[selection]);
+ }
+ else
+ {
+ FreeSpriteTilesByTag(TAG_ITEM_ICON);
+ FreeSpritePaletteByTag(TAG_ITEM_ICON);
+ sScrollableMultichoice_ItemSpriteId = AddDecorationIconObject(sFrontierExchangeCorner_Decor1[selection], 33, 88, 0, TAG_ITEM_ICON, TAG_ITEM_ICON);
+ }
+ break;
+ case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2:
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_Decor2Descriptions[selection], 0, NULL, 2, 1, 3);
+ if (sFrontierExchangeCorner_Decor2[selection] == 0xFFFF)
+ {
+ ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Decor2[selection]);
+ }
+ else
+ {
+ FreeSpriteTilesByTag(TAG_ITEM_ICON);
+ FreeSpritePaletteByTag(TAG_ITEM_ICON);
+ sScrollableMultichoice_ItemSpriteId = AddDecorationIconObject(sFrontierExchangeCorner_Decor2[selection], 33, 88, 0, TAG_ITEM_ICON, TAG_ITEM_ICON);
+ }
+ break;
+ case SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR:
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_VitaminsDescriptions[selection], 0, NULL, 2, 1, 3);
+ ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Vitamins[selection]);
+ break;
+ case SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR:
+ AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_HoldItemsDescriptions[selection], 0, NULL, 2, 1, 3);
+ ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_HoldItems[selection]);
+ break;
}
}
}
@@ -3114,12 +2976,12 @@ static void HideFrontierExchangeCornerItemIcon(u16 menu, u16 unused)
{
switch (menu)
{
- case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1:
- case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2:
- case SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR:
- case SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR:
- DestroySpriteAndFreeResources(&gSprites[sScrollableMultichoice_ItemSpriteId]);
- break;
+ case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1:
+ case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2:
+ case SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR:
+ case SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR:
+ DestroySpriteAndFreeResources(&gSprites[sScrollableMultichoice_ItemSpriteId]);
+ break;
}
sScrollableMultichoice_ItemSpriteId = MAX_SPRITES;
}
@@ -3156,13 +3018,9 @@ static const u16 sBattleFrontier_TutorMoves2[] =
void BufferBattleFrontierTutorMoveName(void)
{
if (gSpecialVar_0x8005 != 0)
- {
StringCopy(gStringVar1, gMoveNames[sBattleFrontier_TutorMoves2[gSpecialVar_0x8004]]);
- }
else
- {
StringCopy(gStringVar1, gMoveNames[sBattleFrontier_TutorMoves1[gSpecialVar_0x8004]]);
- }
}
static void ShowBattleFrontierTutorWindow(u8 menu, u16 selection)
@@ -3225,13 +3083,9 @@ static void ShowBattleFrontierTutorMoveDescription(u8 menu, u16 selection)
{
FillWindowPixelRect(sTutorMoveAndElevatorWindowId, PIXEL_FILL(1), 0, 0, 96, 48);
if (menu == SCROLL_MULTI_BF_MOVE_TUTOR_2)
- {
AddTextPrinterParameterized(sTutorMoveAndElevatorWindowId, FONT_NORMAL, sBattleFrontier_TutorMoveDescriptions2[selection], 0, 1, 0, NULL);
- }
else
- {
AddTextPrinterParameterized(sTutorMoveAndElevatorWindowId, FONT_NORMAL, sBattleFrontier_TutorMoveDescriptions1[selection], 0, 1, 0, NULL);
- }
}
}
@@ -3453,13 +3307,9 @@ void IncrementBirthIslandRockStepCount(void)
{
var++;
if (var > 99)
- {
VarSet(VAR_DEOXYS_ROCK_STEP_COUNT, 0);
- }
else
- {
VarSet(VAR_DEOXYS_ROCK_STEP_COUNT, var);
- }
}
}
@@ -3505,18 +3355,14 @@ bool8 IsDestinationBoxFull(void)
if (GetBoxMonData(GetBoxedMonPtr(box, i), MON_DATA_SPECIES, 0) == SPECIES_NONE)
{
if (GetPCBoxToSendMon() != box)
- {
FlagClear(FLAG_SHOWN_BOX_WAS_FULL_MESSAGE);
- }
VarSet(VAR_PC_BOX_TO_SEND_MON, box);
return ShouldShowBoxWasFullMessage();
}
}
if (++box == TOTAL_BOXES_COUNT)
- {
box = 0;
- }
} while (box != StorageGetCurrentBox());
return FALSE;
}
@@ -3582,7 +3428,8 @@ bool32 GetAbnormalWeatherMapNameAndType(void)
bool8 AbnormalWeatherHasExpired(void)
{
// Duplicate array.
- static const u8 sAbnormalWeatherMapNumbers[] = {
+ static const u8 sAbnormalWeatherMapNumbers[] =
+ {
MAP_NUM(ROUTE114),
MAP_NUM(ROUTE114),
MAP_NUM(ROUTE115),
@@ -3605,9 +3452,7 @@ bool8 AbnormalWeatherHasExpired(void)
u16 abnormalWeather = VarGet(VAR_ABNORMAL_WEATHER_LOCATION);
if (abnormalWeather == ABNORMAL_WEATHER_NONE)
- {
return FALSE;
- }
if (++steps > 999)
{
@@ -3616,15 +3461,15 @@ bool8 AbnormalWeatherHasExpired(void)
{
switch (gSaveBlock1Ptr->location.mapNum)
{
- case MAP_NUM(UNDERWATER_MARINE_CAVE):
- case MAP_NUM(MARINE_CAVE_ENTRANCE):
- case MAP_NUM(MARINE_CAVE_END):
- case MAP_NUM(TERRA_CAVE_ENTRANCE):
- case MAP_NUM(TERRA_CAVE_END):
- VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 1);
- return FALSE;
- default:
- break;
+ case MAP_NUM(UNDERWATER_MARINE_CAVE):
+ case MAP_NUM(MARINE_CAVE_ENTRANCE):
+ case MAP_NUM(MARINE_CAVE_END):
+ case MAP_NUM(TERRA_CAVE_ENTRANCE):
+ case MAP_NUM(TERRA_CAVE_END):
+ VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 1);
+ return FALSE;
+ default:
+ break;
}
}
@@ -3632,14 +3477,14 @@ bool8 AbnormalWeatherHasExpired(void)
{
switch (gSaveBlock1Ptr->location.mapNum)
{
- case MAP_NUM(UNDERWATER_ROUTE127):
- case MAP_NUM(UNDERWATER_ROUTE129):
- case MAP_NUM(UNDERWATER_ROUTE105):
- case MAP_NUM(UNDERWATER_ROUTE125):
- VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 1);
- return FALSE;
- default:
- break;
+ case MAP_NUM(UNDERWATER_ROUTE127):
+ case MAP_NUM(UNDERWATER_ROUTE129):
+ case MAP_NUM(UNDERWATER_ROUTE105):
+ case MAP_NUM(UNDERWATER_ROUTE125):
+ VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 1);
+ return FALSE;
+ default:
+ break;
}
}
@@ -3691,9 +3536,7 @@ u32 GetMartEmployeeObjectEventId(void)
if (gSaveBlock1Ptr->location.mapGroup == sPokeMarts[i][0])
{
if (gSaveBlock1Ptr->location.mapNum == sPokeMarts[i][1])
- {
return sPokeMarts[i][2];
- }
}
}
return 1;
@@ -3748,9 +3591,7 @@ static void Task_LinkRetireStatusWithBattleTowerPartner(u8 taskId)
{
case 0:
if (!FuncIsActiveTask(Task_ReconnectWithLinkPlayers))
- {
gTasks[taskId].tState++;
- }
break;
case 1:
if (IsLinkTaskFinished() == TRUE)
@@ -3781,23 +3622,15 @@ static void Task_LinkRetireStatusWithBattleTowerPartner(u8 taskId)
if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_RETIRE
&& gSpecialVar_0x8005 == BATTLE_TOWER_LINK_RETIRE)
- {
gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_BOTH_RETIRE;
- }
else if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_CONTINUE
&& gSpecialVar_0x8005 == BATTLE_TOWER_LINK_RETIRE)
- {
gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_MEMBER_RETIRE;
- }
else if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_RETIRE
&& gSpecialVar_0x8005 == BATTLE_TOWER_LINK_CONTINUE)
- {
gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_LEADER_RETIRE;
- }
else
- {
gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_CONTINUE;
- }
}
gTasks[taskId].tState++;
}
@@ -3912,9 +3745,7 @@ static void Task_LoopWingFlapSE(u8 taskId)
}
if (playCount == gSpecialVar_0x8004 - 1)
- {
DestroyTask(taskId);
- }
}
#undef playCount
@@ -3976,9 +3807,7 @@ void GetBattlePyramidHint(void)
void ResetHealLocationFromDewford(void)
{
if (gSaveBlock1Ptr->lastHealLocation.mapGroup == MAP_GROUP(DEWFORD_TOWN) && gSaveBlock1Ptr->lastHealLocation.mapNum == MAP_NUM(DEWFORD_TOWN))
- {
SetLastHealLocationWarp(HEAL_LOCATION_PETALBURG_CITY);
- }
}
bool8 InPokemonCenter(void)
@@ -4015,9 +3844,7 @@ bool8 InPokemonCenter(void)
for (i = 0; sPokemonCenters[i] != 0xFFFF; i++)
{
if (sPokemonCenters[i] == map)
- {
return TRUE;
- }
}
return FALSE;
}
@@ -4192,9 +4019,7 @@ static u16 PlayerLoseRandomTrainerFan(void)
u8 idx = 0;
if (GetNumFansOfPlayerInTrainerFanClub() == 1)
- {
return 0;
- }
for (i = 0; i < ARRAY_COUNT(sFanClubMemberIds); i++)
{
@@ -4210,9 +4035,7 @@ static u16 PlayerLoseRandomTrainerFan(void)
}
if (GET_TRAINER_FAN_CLUB_FLAG(sFanClubMemberIds[idx]))
- {
FLIP_TRAINER_FAN_CLUB_FLAG(sFanClubMemberIds[idx]);
- }
return idx;
}
@@ -4277,32 +4100,32 @@ void BufferFanClubTrainerName(void)
u8 whichNPCTrainer = 0;
switch (gSpecialVar_0x8004)
{
- case FANCLUB_MEMBER1:
- break;
- case FANCLUB_MEMBER2:
- break;
- case FANCLUB_MEMBER3:
- whichLinkTrainer = 0;
- whichNPCTrainer = 3;
- break;
- case FANCLUB_MEMBER4:
- whichLinkTrainer = 0;
- whichNPCTrainer = 1;
- break;
- case FANCLUB_MEMBER5:
- whichLinkTrainer = 1;
- whichNPCTrainer = 0;
- break;
- case FANCLUB_MEMBER6:
- whichLinkTrainer = 0;
- whichNPCTrainer = 4;
- break;
- case FANCLUB_MEMBER7:
- whichLinkTrainer = 1;
- whichNPCTrainer = 5;
- break;
- case FANCLUB_MEMBER8:
- break;
+ case FANCLUB_MEMBER1:
+ break;
+ case FANCLUB_MEMBER2:
+ break;
+ case FANCLUB_MEMBER3:
+ whichLinkTrainer = 0;
+ whichNPCTrainer = 3;
+ break;
+ case FANCLUB_MEMBER4:
+ whichLinkTrainer = 0;
+ whichNPCTrainer = 1;
+ break;
+ case FANCLUB_MEMBER5:
+ whichLinkTrainer = 1;
+ whichNPCTrainer = 0;
+ break;
+ case FANCLUB_MEMBER6:
+ whichLinkTrainer = 0;
+ whichNPCTrainer = 4;
+ break;
+ case FANCLUB_MEMBER7:
+ whichLinkTrainer = 1;
+ whichNPCTrainer = 5;
+ break;
+ case FANCLUB_MEMBER8:
+ break;
}
BufferFanClubTrainerName_(&gSaveBlock1Ptr->linkBattleRecords, whichLinkTrainer, whichNPCTrainer);
}
@@ -4314,27 +4137,27 @@ static void BufferFanClubTrainerName_(struct LinkBattleRecords *linkRecords, u8
{
switch (whichNPCTrainer)
{
- case 0:
- StringCopy(gStringVar1, gText_Wallace);
- break;
- case 1:
- StringCopy(gStringVar1, gText_Steven);
- break;
- case 2:
- StringCopy(gStringVar1, gText_Brawly);
- break;
- case 3:
- StringCopy(gStringVar1, gText_Winona);
- break;
- case 4:
- StringCopy(gStringVar1, gText_Phoebe);
- break;
- case 5:
- StringCopy(gStringVar1, gText_Glacia);
- break;
- default:
- StringCopy(gStringVar1, gText_Wallace);
- break;
+ case 0:
+ StringCopy(gStringVar1, gText_Wallace);
+ break;
+ case 1:
+ StringCopy(gStringVar1, gText_Steven);
+ break;
+ case 2:
+ StringCopy(gStringVar1, gText_Brawly);
+ break;
+ case 3:
+ StringCopy(gStringVar1, gText_Winona);
+ break;
+ case 4:
+ StringCopy(gStringVar1, gText_Phoebe);
+ break;
+ case 5:
+ StringCopy(gStringVar1, gText_Glacia);
+ break;
+ default:
+ StringCopy(gStringVar1, gText_Wallace);
+ break;
}
}
else
diff --git a/src/frontier_pass.c b/src/frontier_pass.c
index 07dd8f228..b14358741 100644
--- a/src/frontier_pass.c
+++ b/src/frontier_pass.c
@@ -173,7 +173,7 @@ static const u32 sHeads_Gfx[] = INCBIN_U32("graphics/frontier
static const u32 sMapCursor_Gfx[] = INCBIN_U32("graphics/frontier_pass/map_cursor.4bpp.lz");
static const u32 sMapScreen_Tilemap[] = INCBIN_U32("graphics/frontier_pass/map_screen.bin.lz");
static const u32 sMapAndCard_ZoomedOut_Tilemap[] = INCBIN_U32("graphics/frontier_pass/small_map_and_card.bin.lz");
-static const u32 sUnusedData[] = INCBIN_U32("graphics/frontier_pass/unused.bin");
+static const u32 sCardBall_Filled_Tilemap[] = INCBIN_U32("graphics/frontier_pass/card_ball_filled.bin"); // Unused
static const u32 sBattleRecord_Tilemap[] = INCBIN_U32("graphics/frontier_pass/record_frame.bin.lz");
static const u32 sMapAndCard_Zooming_Tilemap[] = INCBIN_U32("graphics/frontier_pass/small_map_and_card_affine.bin.lz");
diff --git a/src/graphics.c b/src/graphics.c
index 73825aebf..47b82b6b7 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -435,15 +435,15 @@ const u32 gBattleAnimSpriteGfx_BlueFlames2[] = INCBIN_U32("graphics/battle_anims
// Contest
const u32 gJPContestGfx1[] = INCBIN_U32("graphics/contest/japanese/composite_1.4bpp.lz");
const u32 gJPContestPal[] = INCBIN_U32("graphics/contest/japanese/palette.gbapal.lz");
-const u32 gJPContestTilemap1[] = INCBIN_U32("graphics/contest/japanese/tilemap_1.bin.lz");
-const u32 gJPContestTilemap2[] = INCBIN_U32("graphics/contest/japanese/tilemap_2.bin.lz");
+const u32 gJPContestBgTilemap[] = INCBIN_U32("graphics/contest/japanese/bg.bin.lz");
+const u32 gJPContestWindowsTilemap[] = INCBIN_U32("graphics/contest/japanese/windows.bin.lz");
const u32 gJPContestGfx2[] = INCBIN_U32("graphics/contest/japanese/composite_2.4bpp.lz");
const u32 gContestInterfaceAudiencePalette[] = INCBIN_U32("graphics/contest/interface_audience.gbapal.lz");
const u32 gContestAudienceTilemap[] = INCBIN_U32("graphics/contest/audience.bin.lz");
const u32 gContestInterfaceTilemap[] = INCBIN_U32("graphics/contest/interface.bin.lz");
-const u32 gContestUnusedTilemap1[] = INCBIN_U32("graphics/contest/unused_tilemap_1.bin.lz");
-const u32 gContestUnusedTilemap2[] = INCBIN_U32("graphics/contest/unused_tilemap_2.bin.lz");
+const u32 gJPContestInterfaceTilemap[] = INCBIN_U32("graphics/contest/japanese/interface.bin.lz");
+const u32 gJPContestAudienceTilemap[] = INCBIN_U32("graphics/contest/japanese/audience.bin.lz");
const u32 gContestCurtainTilemap[] = INCBIN_U32("graphics/contest/curtain.bin.lz");
const u32 gContestInterfaceGfx[] = INCBIN_U32("graphics/contest/interface.4bpp.lz");
@@ -1505,12 +1505,12 @@ const u16 gMonIconPalettes[][16] =
const u16 gTitleScreenBgPalettes[] = INCBIN_U16("graphics/title_screen/pokemon_logo.gbapal",
"graphics/title_screen/rayquaza_and_clouds.gbapal");
const u16 gTitleScreenEmeraldVersionPal[] = INCBIN_U16("graphics/title_screen/emerald_version.gbapal");
-const u32 gTitleScreenCloudsTilemap[] = INCBIN_U32("graphics/title_screen/title_screen1.bin.lz");
+const u32 gTitleScreenCloudsTilemap[] = INCBIN_U32("graphics/title_screen/clouds.bin.lz");
const u32 gTitleScreenPokemonLogoGfx[] = INCBIN_U32("graphics/title_screen/pokemon_logo.8bpp.lz");
const u32 gTitleScreenEmeraldVersionGfx[] = INCBIN_U32("graphics/title_screen/emerald_version.8bpp.lz");
const u16 gTitleScreenPressStartPal[] = INCBIN_U16("graphics/title_screen/press_start.gbapal");
const u32 gTitleScreenPressStartGfx[] = INCBIN_U32("graphics/title_screen/press_start.4bpp.lz");
-const u32 gTitleScreenPokemonLogoTilemap[] = INCBIN_U32("graphics/title_screen/title_screen2.bin.lz");
+const u32 gTitleScreenPokemonLogoTilemap[] = INCBIN_U32("graphics/title_screen/pokemon_logo.bin.lz");
// size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well
const u16 gFrontierPassBg_Pal[][16] = INCBIN_U16("graphics/frontier_pass/bg.gbapal");
diff --git a/src/mail_data.c b/src/mail_data.c
index ca50a687e..99cf1f9ed 100644
--- a/src/mail_data.c
+++ b/src/mail_data.c
@@ -5,7 +5,6 @@
#include "pokemon_icon.h"
#include "text.h"
#include "international_string_util.h"
-#include "constants/easy_chat.h"
#define UNOWN_OFFSET 30000
diff --git a/src/main_menu.c b/src/main_menu.c
index 601e66cb9..e7802b1e7 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -104,7 +104,7 @@
* printing, and then wait for A or B to be pressed.
* - Then advance to Task_HandleMainMenuBPressed.
*
- * Task_NewGameBirchSpeechInit
+ * Task_NewGameBirchSpeech_Init
* - Load the sprites for the intro speech, start playing music
* Task_NewGameBirchSpeech_WaitToShowBirch
* - Spawn Task_NewGameBirchSpeech_FadeInTarget1OutTarget2
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 06c3b8288..681a3dadf 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -1,7 +1,6 @@
#include "global.h"
#include "main.h"
#include "constants/songs.h"
-#include "constants/easy_chat.h"
#include "constants/event_objects.h"
#include "mauville_old_man.h"
#include "event_data.h"
diff --git a/src/party_menu.c b/src/party_menu.c
index 34aff619f..36e83a168 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -65,7 +65,6 @@
#include "window.h"
#include "constants/battle.h"
#include "constants/battle_frontier.h"
-#include "constants/easy_chat.h"
#include "constants/field_effects.h"
#include "constants/item_effects.h"
#include "constants/items.h"
diff --git a/src/save.c b/src/save.c
index b53956438..dafc20868 100644
--- a/src/save.c
+++ b/src/save.c
@@ -428,7 +428,7 @@ static u8 CopySectorSecurityByte(u16 sectorId, const struct SaveSectorLocation *
}
else
{
- // Succeded
+ // Succeeded
SetDamagedSectorBits(DISABLE, sector);
return SAVE_STATUS_OK;
}
@@ -734,7 +734,7 @@ u8 HandleSavingData(u8 saveType)
WriteSaveSectorOrSlot(FULL_SAVE_SLOT, gRamSaveSectorLocations);
break;
case SAVE_LINK:
- case SAVE_LINK2:
+ case SAVE_EREADER: // Dummied, now duplicate of SAVE_LINK
// Used by link / Battle Frontier
// Write only SaveBlocks 1 and 2 (skips the PC)
CopyPartyAndObjectsToSave();
diff --git a/src/slot_machine.c b/src/slot_machine.c
index 6cbcd76fd..c58de415b 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -7154,18 +7154,18 @@ static const struct SpriteSheet sSlotMachineSpriteSheets[22] =
static const u8 *const sReelBackground_Tilemap = gSlotMachineReelBackground_Tilemap;
-static const u16 sUnused[] =
+static const u16 sUnusedColors[] =
{
- 0x6F7B,
- 0x6968,
- 0x36AB,
- 0x7FFF,
- 0x5750,
- 0x7EC0,
- 0x02BA,
- 0x02BA,
- 0x01FD,
- 0x01FD,
+ RGB(27, 27, 27),
+ RGB(8, 11, 26),
+ RGB(11, 21, 13),
+ RGB(31, 31, 31),
+ RGB(16, 26, 21),
+ RGB(0, 22, 31),
+ RGB(26, 21, 0),
+ RGB(26, 21, 0),
+ RGB(29, 15, 0),
+ RGB(29, 15, 0),
};
// The Bet 2 and 3 match line palettes are duplicated unnecessarily
@@ -7234,7 +7234,10 @@ static const u16 *const sPokeballShiningPalTable[] =
};
static const u16 *const sDigitalDisplay_Pal = gSlotMachineDigitalDisplay_Pal;
-static const u16 sUnkPalette[] = INCBIN_U16("graphics/slot_machine/85A8524.bin");
+static const u16 sUnkPalette[16] = {
+ [1] = RGB_WHITEALPHA,
+ [3] = RGB(8, 8, 8),
+};
static const struct SpritePalette sSlotMachineSpritePalettes[] =
{
diff --git a/src/title_screen.c b/src/title_screen.c
index 93e01327c..d64ee6024 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -52,7 +52,7 @@ static void SpriteCB_PressStartCopyrightBanner(struct Sprite *sprite);
static void SpriteCB_PokemonLogoShine(struct Sprite *sprite);
// const rom data
-static const u16 sUnusedUnknownPal[] = INCBIN_U16("graphics/title_screen/unk_853EF78.gbapal");
+static const u16 sUnusedUnknownPal[] = INCBIN_U16("graphics/title_screen/unused.gbapal");
static const u32 sTitleScreenRayquazaGfx[] = INCBIN_U32("graphics/title_screen/rayquaza.4bpp.lz");
static const u32 sTitleScreenRayquazaTilemap[] = INCBIN_U32("graphics/title_screen/rayquaza.bin.lz");
diff --git a/src/trade.c b/src/trade.c
index 935a89b02..b48d1abf5 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -44,7 +44,6 @@
#include "util.h"
#include "window.h"
#include "constants/contest.h"
-#include "constants/easy_chat.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/region_map_sections.h"
diff --git a/src/trader.c b/src/trader.c
index 1d4424e75..abe581db3 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -77,11 +77,11 @@ void CreateAvailableDecorationsMenu(u8 taskId)
for (i = 0; i < 4; i++)
{
if (trader->decorations[i] > NUM_DECORATIONS)
- AddTextPrinterParameterized(data[3], FONT_NORMAL, gText_FiveMarks, 8, 16 * i + 1, 255, NULL);
+ AddTextPrinterParameterized(data[3], FONT_NORMAL, gText_FiveMarks, 8, 16 * i + 1, TEXT_SKIP_DRAW, NULL);
else
- AddTextPrinterParameterized(data[3], FONT_NORMAL, gDecorations[trader->decorations[i]].name, 8, 16 * i + 1, 255, NULL);
+ AddTextPrinterParameterized(data[3], FONT_NORMAL, gDecorations[trader->decorations[i]].name, 8, 16 * i + 1, TEXT_SKIP_DRAW, NULL);
}
- AddTextPrinterParameterized(data[3], FONT_NORMAL, gText_Exit, 8, 16 * i + 1, 255, NULL);
+ AddTextPrinterParameterized(data[3], FONT_NORMAL, gText_Exit, 8, 16 * i + 1, TEXT_SKIP_DRAW, NULL);
InitMenuInUpperLeftCornerNormal(data[3], 5, 0);
ScheduleBgCopyTilemapToVram(0);
}
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index 04312a2dd..3ada262e5 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -29,7 +29,6 @@
#include "constants/layouts.h"
#include "constants/moves.h"
#include "constants/trainers.h"
-#include "constants/easy_chat.h"
#include "constants/trainer_hill.h"
#include "constants/trainer_types.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 12:09:58 +0000