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/data/pokedex_area_glow.h315
-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.c1540
-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/pokedex_area_region_map.c12
-rwxr-xr-xsrc/pokedex_area_screen.c571
-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
-rw-r--r--src/wild_encounter.c21
29 files changed, 1313 insertions, 1234 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/data/pokedex_area_glow.h b/src/data/pokedex_area_glow.h
new file mode 100644
index 000000000..ff24d8d6c
--- /dev/null
+++ b/src/data/pokedex_area_glow.h
@@ -0,0 +1,315 @@
+// These tile numbers correspond to the 8x8 tiles in graphics/pokedex/area_glow.png
+// Left/Right/Top/Bottom are shortened to L/R/T/B
+enum {
+ GLOW_TILE_EMPTY,
+ GLOW_TILE_EDGE_R,
+ GLOW_TILE_EDGE_L,
+ GLOW_TILE_EDGE_L_R,
+ GLOW_TILE_EDGE_B,
+ GLOW_TILE_EDGE_B_R,
+ GLOW_TILE_EDGE_B_L,
+ GLOW_TILE_EDGE_B_L_R,
+ GLOW_TILE_EDGE_T,
+ GLOW_TILE_EDGE_T_R,
+ GLOW_TILE_EDGE_T_L,
+ GLOW_TILE_EDGE_T_L_R,
+ GLOW_TILE_EDGE_T_B,
+ GLOW_TILE_EDGE_T_B_R,
+ GLOW_TILE_EDGE_T_B_L,
+ GLOW_TILE_EDGE_T_B_L_R, // This tile has a misplaced pixel in the top-left corner
+ GLOW_TILE_FULL,
+ GLOW_TILE_CORNER_TL,
+ GLOW_TILE_CORNER_BL,
+ GLOW_TILE_CORNER_BL_TL,
+ GLOW_TILE_CORNER_TR,
+ GLOW_TILE_CORNER_TR_TL,
+ GLOW_TILE_CORNER_TR_BL,
+ GLOW_TILE_CORNER_TR_BL_TL,
+ GLOW_TILE_CORNER_BR,
+ GLOW_TILE_CORNER_BR_TL,
+ GLOW_TILE_CORNER_BR_BL,
+ GLOW_TILE_CORNER_BR_BL_TL,
+ GLOW_TILE_CORNER_BR_TR,
+ GLOW_TILE_CORNER_BR_TR_TL,
+ GLOW_TILE_CORNER_BR_TR_BL,
+ GLOW_TILE_CORNER_BR_TR_BL_TL,
+ GLOW_TILE_EDGE_R_CORNER_TL,
+ GLOW_TILE_EDGE_R_CORNER_BL,
+ GLOW_TILE_EDGE_R_CORNER_BL_TL,
+ GLOW_TILE_EDGE_L_CORNER_TR,
+ GLOW_TILE_EDGE_L_CORNER_BR,
+ GLOW_TILE_EDGE_L_CORNER_BR_TR,
+ GLOW_TILE_EDGE_B_CORNER_TR,
+ GLOW_TILE_EDGE_B_CORNER_TL,
+ GLOW_TILE_EDGE_B_CORNER_TL_TR,
+ GLOW_TILE_EDGE_T_CORNER_BR,
+ GLOW_TILE_EDGE_T_CORNER_BL,
+ GLOW_TILE_EDGE_T_CORNER_BL_BR,
+ GLOW_TILE_EDGE_B_L_CORNER_TR,
+ GLOW_TILE_EDGE_B_R_CORNER_TL,
+ GLOW_TILE_EDGE_T_R_CORNER_BL,
+ GLOW_TILE_EDGE_T_L_CORNER_BR
+};
+
+// This array converts a set of glow position flags to one of the above tile values.
+// Only some parts of this array are actually used, because corner flags that overlap
+// with edge flags are cancelled out before lookup. For example, GLOW_CORNER_TL | GLOW_EDGE_L
+// will never be read, and has the same value as GLOW_EDGE_L.
+static const u8 sAreaGlowTilemapMapping[] = {
+ [0] = GLOW_TILE_EMPTY,
+ [GLOW_EDGE_R] = GLOW_TILE_EDGE_R,
+ [GLOW_EDGE_L] = GLOW_TILE_EDGE_L,
+ [GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_EDGE_B] = GLOW_TILE_EDGE_B,
+ [GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R,
+ [GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L,
+ [GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_EDGE_T] = GLOW_TILE_EDGE_T,
+ [GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R,
+ [GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L,
+ [GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_TL] = GLOW_TILE_CORNER_TL,
+ [GLOW_CORNER_TL | GLOW_EDGE_R] = GLOW_TILE_EDGE_R_CORNER_TL,
+ [GLOW_CORNER_TL | GLOW_EDGE_L] = GLOW_TILE_EDGE_L,
+ [GLOW_CORNER_TL | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_TL | GLOW_EDGE_B] = GLOW_TILE_EDGE_B_CORNER_TL,
+ [GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R_CORNER_TL,
+ [GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L,
+ [GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_TL | GLOW_EDGE_T] = GLOW_TILE_EDGE_T,
+ [GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R,
+ [GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L,
+ [GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_BL] = GLOW_TILE_CORNER_BL,
+ [GLOW_CORNER_BL | GLOW_EDGE_R] = GLOW_TILE_EDGE_R_CORNER_BL,
+ [GLOW_CORNER_BL | GLOW_EDGE_L] = GLOW_TILE_EDGE_L,
+ [GLOW_CORNER_BL | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_BL | GLOW_EDGE_B] = GLOW_TILE_EDGE_B,
+ [GLOW_CORNER_BL | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R,
+ [GLOW_CORNER_BL | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L,
+ [GLOW_CORNER_BL | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_BL | GLOW_EDGE_T] = GLOW_TILE_EDGE_T_CORNER_BL,
+ [GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R_CORNER_BL,
+ [GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L,
+ [GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL] = GLOW_TILE_CORNER_BL_TL,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_R] = GLOW_TILE_EDGE_R_CORNER_BL_TL,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_L] = GLOW_TILE_EDGE_L,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B] = GLOW_TILE_EDGE_B_CORNER_TL,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R_CORNER_TL,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T] = GLOW_TILE_EDGE_T_CORNER_BL,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R_CORNER_BL,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_TR] = GLOW_TILE_CORNER_TR,
+ [GLOW_CORNER_TR | GLOW_EDGE_R] = GLOW_TILE_EDGE_R,
+ [GLOW_CORNER_TR | GLOW_EDGE_L] = GLOW_TILE_EDGE_L_CORNER_TR,
+ [GLOW_CORNER_TR | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_TR | GLOW_EDGE_B] = GLOW_TILE_EDGE_B_CORNER_TR,
+ [GLOW_CORNER_TR | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R,
+ [GLOW_CORNER_TR | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L_CORNER_TR,
+ [GLOW_CORNER_TR | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_TR | GLOW_EDGE_T] = GLOW_TILE_EDGE_T,
+ [GLOW_CORNER_TR | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R,
+ [GLOW_CORNER_TR | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L,
+ [GLOW_CORNER_TR | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_TR | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_TR | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_TR | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_TR | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL] = GLOW_TILE_CORNER_TR_TL,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_R] = GLOW_TILE_EDGE_R_CORNER_TL,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_L] = GLOW_TILE_EDGE_L_CORNER_TR,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_B] = GLOW_TILE_EDGE_B_CORNER_TL_TR,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R_CORNER_TL,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L_CORNER_TR,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T] = GLOW_TILE_EDGE_T,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL] = GLOW_TILE_CORNER_TR_BL,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_R] = GLOW_TILE_EDGE_R_CORNER_BL,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_L] = GLOW_TILE_EDGE_L_CORNER_TR,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_B] = GLOW_TILE_EDGE_B_CORNER_TR,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L_CORNER_TR,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T] = GLOW_TILE_EDGE_T_CORNER_BL,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R_CORNER_BL,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL] = GLOW_TILE_CORNER_TR_BL_TL,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_R] = GLOW_TILE_EDGE_R_CORNER_BL_TL,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_L] = GLOW_TILE_EDGE_L_CORNER_TR,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B] = GLOW_TILE_EDGE_B_CORNER_TL_TR,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R_CORNER_TL,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L_CORNER_TR,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T] = GLOW_TILE_EDGE_T_CORNER_BL,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R_CORNER_BL,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_BR] = GLOW_TILE_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_EDGE_R] = GLOW_TILE_EDGE_R,
+ [GLOW_CORNER_BR | GLOW_EDGE_L] = GLOW_TILE_EDGE_L_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_BR | GLOW_EDGE_B] = GLOW_TILE_EDGE_B,
+ [GLOW_CORNER_BR | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R,
+ [GLOW_CORNER_BR | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L,
+ [GLOW_CORNER_BR | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_BR | GLOW_EDGE_T] = GLOW_TILE_EDGE_T_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R,
+ [GLOW_CORNER_BR | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_BR | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_BR | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_BR | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_BR | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL] = GLOW_TILE_CORNER_BR_TL,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_R] = GLOW_TILE_EDGE_R_CORNER_TL,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_L] = GLOW_TILE_EDGE_L_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_B] = GLOW_TILE_EDGE_B_CORNER_TL,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R_CORNER_TL,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_T] = GLOW_TILE_EDGE_T_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_BR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL] = GLOW_TILE_CORNER_BR_BL,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_R] = GLOW_TILE_EDGE_R_CORNER_BL,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_L] = GLOW_TILE_EDGE_L_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_B] = GLOW_TILE_EDGE_B,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_T] = GLOW_TILE_EDGE_T_CORNER_BL_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R_CORNER_BL,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL] = GLOW_TILE_CORNER_BR_BL_TL,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_R] = GLOW_TILE_EDGE_R_CORNER_BL_TL,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_L] = GLOW_TILE_EDGE_L_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B] = GLOW_TILE_EDGE_B_CORNER_TL,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R_CORNER_TL,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T] = GLOW_TILE_EDGE_T_CORNER_BL_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R_CORNER_BL,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_BR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR] = GLOW_TILE_CORNER_BR_TR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_R] = GLOW_TILE_EDGE_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_L] = GLOW_TILE_EDGE_L_CORNER_BR_TR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_B] = GLOW_TILE_EDGE_B_CORNER_TR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L_CORNER_TR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_T] = GLOW_TILE_EDGE_T_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL] = GLOW_TILE_CORNER_BR_TR_TL,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_R] = GLOW_TILE_EDGE_R_CORNER_TL,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_L] = GLOW_TILE_EDGE_L_CORNER_BR_TR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_B] = GLOW_TILE_EDGE_B_CORNER_TL_TR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R_CORNER_TL,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L_CORNER_TR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T] = GLOW_TILE_EDGE_T_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL] = GLOW_TILE_CORNER_BR_TR_BL,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_R] = GLOW_TILE_EDGE_R_CORNER_BL,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_L] = GLOW_TILE_EDGE_L_CORNER_BR_TR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_B] = GLOW_TILE_EDGE_B_CORNER_TR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L_CORNER_TR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T] = GLOW_TILE_EDGE_T_CORNER_BL_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R_CORNER_BL,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL] = GLOW_TILE_CORNER_BR_TR_BL_TL,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_R] = GLOW_TILE_EDGE_R_CORNER_BL_TL,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_L] = GLOW_TILE_EDGE_L_CORNER_BR_TR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B] = GLOW_TILE_EDGE_B_CORNER_TL_TR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_R_CORNER_TL,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_B_L_CORNER_TR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_B_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T] = GLOW_TILE_EDGE_T_CORNER_BL_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_R_CORNER_BL,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_L_CORNER_BR,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_L_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B] = GLOW_TILE_EDGE_T_B,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_R,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L] = GLOW_TILE_EDGE_T_B_L,
+ [GLOW_CORNER_BR | GLOW_CORNER_TR | GLOW_CORNER_BL | GLOW_CORNER_TL | GLOW_EDGE_T | GLOW_EDGE_B | GLOW_EDGE_L | GLOW_EDGE_R] = GLOW_TILE_EDGE_T_B_L_R,
+};
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..0a7236913 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)
@@ -973,9 +932,8 @@ u16 GetWeekCount(void)
{
u16 weekCount = gLocalTime.days / 7;
if (weekCount > 9999)
- {
weekCount = 9999;
- }
+
return weekCount;
}
@@ -983,29 +941,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 +983,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 +997,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 +1025,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 +1056,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 +1096,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 +1117,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 +1148,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 +1289,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 +1300,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 +1311,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 +1322,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 +1342,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 +1400,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 +1413,8 @@ bool8 ScriptCheckFreePokemonStorageSpace(void)
bool8 IsPokerusInParty(void)
{
if (!CheckPartyPokerus(gPlayerParty, 0x3f))
- {
return FALSE;
- }
+
return TRUE;
}
@@ -1586,9 +1492,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 +1512,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 +1576,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 +1705,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 +1739,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 +1870,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 +1907,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 +1971,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 +2069,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 +2185,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 +2499,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 +2581,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 +2697,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 +2736,7 @@ void ShowNatureGirlMessage(void)
u8 nature;
if (gSpecialVar_0x8004 >= PARTY_SIZE)
- {
gSpecialVar_0x8004 = 0;
- }
nature = GetNature(&gPlayerParty[gSpecialVar_0x8004]);
ShowFieldMessage(sNatureGirlMessages[nature]);
@@ -2957,13 +2820,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 +2838,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 +2884,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 +2917,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 +2975,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 +3017,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 +3082,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 +3306,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 +3354,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 +3427,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 +3451,7 @@ bool8 AbnormalWeatherHasExpired(void)
u16 abnormalWeather = VarGet(VAR_ABNORMAL_WEATHER_LOCATION);
if (abnormalWeather == ABNORMAL_WEATHER_NONE)
- {
return FALSE;
- }
if (++steps > 999)
{
@@ -3616,15 +3460,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 +3476,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 +3535,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 +3590,7 @@ static void Task_LinkRetireStatusWithBattleTowerPartner(u8 taskId)
{
case 0:
if (!FuncIsActiveTask(Task_ReconnectWithLinkPlayers))
- {
gTasks[taskId].tState++;
- }
break;
case 1:
if (IsLinkTaskFinished() == TRUE)
@@ -3781,23 +3621,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 +3744,7 @@ static void Task_LoopWingFlapSE(u8 taskId)
}
if (playCount == gSpecialVar_0x8004 - 1)
- {
DestroyTask(taskId);
- }
}
#undef playCount
@@ -3976,9 +3806,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 +3843,7 @@ bool8 InPokemonCenter(void)
for (i = 0; sPokemonCenters[i] != 0xFFFF; i++)
{
if (sPokemonCenters[i] == map)
- {
return TRUE;
- }
}
return FALSE;
}
@@ -4192,9 +4018,7 @@ static u16 PlayerLoseRandomTrainerFan(void)
u8 idx = 0;
if (GetNumFansOfPlayerInTrainerFanClub() == 1)
- {
return 0;
- }
for (i = 0; i < ARRAY_COUNT(sFanClubMemberIds); i++)
{
@@ -4210,9 +4034,7 @@ static u16 PlayerLoseRandomTrainerFan(void)
}
if (GET_TRAINER_FAN_CLUB_FLAG(sFanClubMemberIds[idx]))
- {
FLIP_TRAINER_FAN_CLUB_FLAG(sFanClubMemberIds[idx]);
- }
return idx;
}
@@ -4277,32 +4099,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 +4136,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/pokedex_area_region_map.c b/src/pokedex_area_region_map.c
index 2ec2c5c8d..4926c019d 100644
--- a/src/pokedex_area_region_map.c
+++ b/src/pokedex_area_region_map.c
@@ -8,11 +8,11 @@
static EWRAM_DATA u8 *sPokedexAreaMapBgNum = NULL;
-static const u16 sPokedexAreaMap_Pal[] = INCBIN_U16("graphics/interface/region_map.gbapal");
-static const u32 sPokedexAreaMap_Gfx[] = INCBIN_U32("graphics/interface/region_map.8bpp.lz");
-static const u32 sPokedexAreaMap_Tilemap[] = INCBIN_U32("graphics/interface/region_map.bin.lz");
-static const u32 sPokedexAreaMapAffine_Gfx[] = INCBIN_U32("graphics/interface/region_map_affine.8bpp.lz");
-static const u32 sPokedexAreaMapAffine_Tilemap[] = INCBIN_U32("graphics/interface/region_map_affine.bin.lz");
+static const u16 sPokedexAreaMap_Pal[] = INCBIN_U16("graphics/pokedex/region_map.gbapal");
+static const u32 sPokedexAreaMap_Gfx[] = INCBIN_U32("graphics/pokedex/region_map.8bpp.lz");
+static const u32 sPokedexAreaMap_Tilemap[] = INCBIN_U32("graphics/pokedex/region_map.bin.lz");
+static const u32 sPokedexAreaMapAffine_Gfx[] = INCBIN_U32("graphics/pokedex/region_map_affine.8bpp.lz");
+static const u32 sPokedexAreaMapAffine_Tilemap[] = INCBIN_U32("graphics/pokedex/region_map_affine.bin.lz");
void LoadPokedexAreaMapGfx(const struct PokedexAreaMapTemplate *template)
{
@@ -41,7 +41,7 @@ void LoadPokedexAreaMapGfx(const struct PokedexAreaMapTemplate *template)
ChangeBgX(template->bg, 0, BG_COORD_SET);
ChangeBgY(template->bg, 0, BG_COORD_SET);
SetBgAttribute(template->bg, BG_ATTR_PALETTEMODE, 1);
- CpuCopy32(sPokedexAreaMap_Pal, &gPlttBufferUnfaded[0x70], 0x60);
+ CpuCopy32(sPokedexAreaMap_Pal, &gPlttBufferUnfaded[0x70], sizeof(sPokedexAreaMap_Pal));
*sPokedexAreaMapBgNum = template->bg;
}
diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c
index 141041f4f..dde86f155 100755
--- a/src/pokedex_area_screen.c
+++ b/src/pokedex_area_screen.c
@@ -20,65 +20,84 @@
#include "constants/rgb.h"
#include "constants/songs.h"
+// There are two types of indicators for the area screen to show where a Pokémon can occur:
+// - Area glows, which highlight any of the maps in MAP_GROUP_TOWNS_AND_ROUTES that have the species.
+// These are a tilemap with colored rectangular areas that blends in and out. The positions of the
+// rectangles is determined by the positions of the matching MAPSEC values on the region map layout.
+// - Area markers, which highlight any of the maps in MAP_GROUP_DUNGEONS or MAP_GROUP_SPECIAL_AREA that
+// have the species. These are circular sprites that flash twice. The positions of the sprites is
+// determined by the data for the corresponding MAPSEC in gRegionMapEntries.
+
+// Only maps in the following map groups have their encounters considered for the area screen
+#define MAP_GROUP_TOWNS_AND_ROUTES MAP_GROUP(PETALBURG_CITY)
+#define MAP_GROUP_DUNGEONS MAP_GROUP(METEOR_FALLS_1F_1R)
+#define MAP_GROUP_SPECIAL_AREA MAP_GROUP(SAFARI_ZONE_NORTHWEST)
+
#define AREA_SCREEN_WIDTH 32
#define AREA_SCREEN_HEIGHT 20
-#define GLOW_TILE_FULL 0xFFFF
-#define GLOW_TILE_LEFT (1 << 0)
-#define GLOW_TILE_RIGHT (1 << 1)
-#define GLOW_TILE_TOP (1 << 2)
-#define GLOW_TILE_BOTTOM (1 << 3)
-#define GLOW_TILE_BOTTOM_RIGHT (1 << 4)
-#define GLOW_TILE_TOP_RIGHT (1 << 5)
-#define GLOW_TILE_BOTTOM_LEFT (1 << 6)
-#define GLOW_TILE_TOP_LEFT (1 << 7)
+#define GLOW_FULL 0xFFFF
+#define GLOW_EDGE_R (1 << 0)
+#define GLOW_EDGE_L (1 << 1)
+#define GLOW_EDGE_B (1 << 2)
+#define GLOW_EDGE_T (1 << 3)
+#define GLOW_CORNER_TL (1 << 4)
+#define GLOW_CORNER_BL (1 << 5)
+#define GLOW_CORNER_TR (1 << 6)
+#define GLOW_CORNER_BR (1 << 7)
+
+#define GLOW_PALETTE 10
+
+#define TAG_AREA_MARKER 2
+#define TAG_AREA_UNKNOWN 3
-struct PokeDexAreaScreenMapIdentity
+#define MAX_AREA_HIGHLIGHTS 64 // Maximum number of rectangular route highlights
+#define MAX_AREA_MARKERS 32 // Maximum number of circular spot highlights
+
+struct OverworldArea
{
u8 mapGroup;
u8 mapNum;
u16 regionMapSectionId;
};
-struct PokeDexAreaScreen
+struct
{
/*0x000*/ void (*callback)(void); // unused
/*0x004*/ MainCallback prev; // unused
/*0x008*/ MainCallback next; // unused
/*0x00C*/ u16 state; // unused
/*0x00E*/ u16 species;
- /*0x010*/ struct PokeDexAreaScreenMapIdentity overworldAreasWithMons[0x40];
+ /*0x010*/ struct OverworldArea overworldAreasWithMons[MAX_AREA_HIGHLIGHTS];
/*0x110*/ u16 numOverworldAreas;
/*0x112*/ u16 numSpecialAreas;
/*0x114*/ u16 drawAreaGlowState;
- /*0x116*/ u16 areaGlowTilemap[0x280];
- /*0x616*/ u16 areaShadeOrMarkerFrameCounter;
- /*0x618*/ u16 areaShadeFrameCounter;
+ /*0x116*/ u16 areaGlowTilemap[AREA_SCREEN_WIDTH * AREA_SCREEN_HEIGHT];
+ /*0x616*/ u16 markerTimer;
+ /*0x618*/ u16 glowTimer;
/*0x61A*/ u16 areaShadeBldArgLo;
/*0x61C*/ u16 areaShadeBldArgHi;
- /*0x61E*/ u8 whichMarkersFlashing;
- /*0x61F*/ u8 specialMarkerCycleCounter;
- /*0x620*/ u16 specialAreaRegionMapSectionIds[0x20];
- /*0x660*/ struct Sprite *areaMarkerSprites[0x20];
+ /*0x61E*/ bool8 showingMarkers;
+ /*0x61F*/ u8 markerFlashCounter;
+ /*0x620*/ u16 specialAreaRegionMapSectionIds[MAX_AREA_MARKERS];
+ /*0x660*/ struct Sprite *areaMarkerSprites[MAX_AREA_MARKERS];
/*0x6E0*/ u16 numAreaMarkerSprites;
- /*0x6E2*/ u16 unk6E2;
- /*0x6E4*/ u16 unk6E4;
+ /*0x6E2*/ u16 alteringCaveCounter;
+ /*0x6E4*/ u16 alteringCaveId;
/*0x6E8*/ u8 *screenSwitchState;
/*0x6EC*/ struct RegionMap regionMap;
- /*0xF70*/ u8 charBuffer[0x40];
+ /*0xF70*/ u8 charBuffer[64];
/*0xFB0*/ struct Sprite * areaUnknownSprites[3];
/*0xFBC*/ u8 areaUnknownGraphicsBuffer[0x600];
-};
-
-static EWRAM_DATA struct PokeDexAreaScreen *sPokedexAreaScreen = NULL;
+} static EWRAM_DATA *sPokedexAreaScreen = NULL;
static void FindMapsWithMon(u16);
static void BuildAreaGlowTilemap(void);
static void SetAreaHasMon(u16, u16);
static void SetSpecialMapHasMon(u16, u16);
static u16 GetRegionMapSectionId(u8, u8);
-static bool8 MapHasMon(const struct WildPokemonHeader *, u16);
-static bool8 MonListHasMon(const struct WildPokemonInfo *, u16, u16);
+static bool8 MapHasSpecies(const struct WildPokemonHeader *, u16);
+static bool8 MonListHasSpecies(const struct WildPokemonInfo *, u16, u16);
static void DoAreaGlow(void);
static void Task_ShowPokedexAreaScreen(u8);
static void CreateAreaMarkerSprites(void);
@@ -86,7 +105,7 @@ static void LoadAreaUnknownGraphics(void);
static void CreateAreaUnknownSprites(void);
static void Task_HandlePokedexAreaScreenInput(u8);
static void ResetPokedexAreaMapBg(void);
-static void DestroyAreaMarkerSprites(void);
+static void DestroyAreaScreenSprites(void);
static const u32 sAreaGlow_Pal[] = INCBIN_U32("graphics/pokedex/area_glow.gbapal");
static const u32 sAreaGlow_Gfx[] = INCBIN_U32("graphics/pokedex/area_glow.4bpp.lz");
@@ -117,115 +136,7 @@ static const u16 sLandmarkData[][2] =
{MAPSEC_NONE}
};
-// Only some parts of this array are acutally used, because corner flags that overlap
-// with edge flags are cancelled out before lookup. For example, GLOW_TILE_BOTTOM_RIGHT | GLOW_TILE_RIGHT
-// will never be read.
-//
-// The rest of the bytes seem to be old data from before the cancellation was implemented.
-// Most of them line up as you would expect ([BOTTOM_RIGHT | RIGHT] has the same value as [RIGHT]).
-//
-// Any unreachable entries are simply listed in order, without the fancy "[FLAGS] = 0xXX" notation.
-static const u8 sAreaGlowTilemapMapping[] = {
- [0] = 0x00,
- [GLOW_TILE_LEFT] = 0x01,
- [GLOW_TILE_RIGHT] = 0x02,
- [GLOW_TILE_RIGHT | GLOW_TILE_LEFT] = 0x03,
- [GLOW_TILE_TOP] = 0x04,
- [GLOW_TILE_TOP | GLOW_TILE_LEFT] = 0x05,
- [GLOW_TILE_TOP | GLOW_TILE_RIGHT] = 0x06,
- [GLOW_TILE_TOP | GLOW_TILE_RIGHT | GLOW_TILE_LEFT] = 0x07,
- [GLOW_TILE_BOTTOM] = 0x08,
- [GLOW_TILE_BOTTOM | GLOW_TILE_LEFT] = 0x09,
- [GLOW_TILE_BOTTOM | GLOW_TILE_RIGHT] = 0x0a,
- [GLOW_TILE_BOTTOM | GLOW_TILE_RIGHT | GLOW_TILE_LEFT] = 0x0b,
- [GLOW_TILE_BOTTOM | GLOW_TILE_TOP] = 0x0c,
- [GLOW_TILE_BOTTOM | GLOW_TILE_TOP | GLOW_TILE_LEFT] = 0x0d,
- [GLOW_TILE_BOTTOM | GLOW_TILE_TOP | GLOW_TILE_RIGHT] = 0x0e,
- [GLOW_TILE_BOTTOM | GLOW_TILE_TOP | GLOW_TILE_RIGHT | GLOW_TILE_LEFT] = 0x0f,
- [GLOW_TILE_BOTTOM_RIGHT] = 0x11,
- [GLOW_TILE_BOTTOM_RIGHT | GLOW_TILE_LEFT] = 0x20,
- 0x02, 0x03,
- [GLOW_TILE_BOTTOM_RIGHT | GLOW_TILE_TOP] = 0x27,
- [GLOW_TILE_BOTTOM_RIGHT | GLOW_TILE_TOP | GLOW_TILE_LEFT] = 0x2d,
- 0x06, 0x07, 0x08, 0x09, 0x0a,
- 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
- [GLOW_TILE_TOP_RIGHT] = 0x12,
- [GLOW_TILE_TOP_RIGHT | GLOW_TILE_LEFT] = 0x21,
- 0x02, 0x03, 0x04, 0x05, 0x06,
- 0x07,
- [GLOW_TILE_TOP_RIGHT | GLOW_TILE_BOTTOM] = 0x2a,
- [GLOW_TILE_TOP_RIGHT | GLOW_TILE_BOTTOM | GLOW_TILE_LEFT] = 0x2e,
- 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
- 0x0f,
- [GLOW_TILE_TOP_RIGHT | GLOW_TILE_BOTTOM_RIGHT] = 0x13,
- [GLOW_TILE_TOP_RIGHT | GLOW_TILE_BOTTOM_RIGHT | GLOW_TILE_LEFT] = 0x22,
- 0x02, 0x03, 0x27, 0x2d, 0x06,
- 0x07, 0x2a, 0x2e, 0x0a, 0x0b,
- 0x0c, 0x0d, 0x0e, 0x0f,
- [GLOW_TILE_BOTTOM_LEFT] = 0x14,
- 0x01,
- [GLOW_TILE_BOTTOM_LEFT | GLOW_TILE_RIGHT] = 0x23,
- 0x03,
- [GLOW_TILE_BOTTOM_LEFT | GLOW_TILE_TOP] = 0x26,
- 0x05,
- [GLOW_TILE_BOTTOM_LEFT | GLOW_TILE_TOP | GLOW_TILE_RIGHT] = 0x2c,
- 0x07, 0x08, 0x09, 0x0a, 0x0b,
- 0x0c, 0x0d, 0x0e, 0x0f,
- [GLOW_TILE_BOTTOM_LEFT | GLOW_TILE_BOTTOM_RIGHT] = 0x15,
- 0x20, 0x23, 0x03,
- [GLOW_TILE_BOTTOM_LEFT | GLOW_TILE_BOTTOM_RIGHT | GLOW_TILE_TOP] = 0x28,
- 0x2d, 0x2c, 0x07, 0x08, 0x09,
- 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
- 0x0f,
- [GLOW_TILE_BOTTOM_LEFT | GLOW_TILE_TOP_RIGHT] = 0x16,
- 0x21, 0x23, 0x03, 0x26, 0x05,
- 0x2c, 0x07, 0x2a, 0x2e, 0x0a,
- 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
- [GLOW_TILE_BOTTOM_LEFT | GLOW_TILE_TOP_RIGHT | GLOW_TILE_BOTTOM_RIGHT] = 0x17,
- 0x22, 0x23, 0x03, 0x28, 0x2d,
- 0x2c, 0x07, 0x2a, 0x2e, 0x0a,
- 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
- [GLOW_TILE_TOP_LEFT] = 0x18,
- 0x01,
- [GLOW_TILE_TOP_LEFT | GLOW_TILE_RIGHT] = 0x24,
- 0x03, 0x04, 0x05, 0x06, 0x07,
- [GLOW_TILE_TOP_LEFT | GLOW_TILE_BOTTOM] = 0x29,
- 0x09,
- [GLOW_TILE_TOP_LEFT | GLOW_TILE_BOTTOM | GLOW_TILE_RIGHT] = 0x2f,
- 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
- [GLOW_TILE_TOP_LEFT | GLOW_TILE_BOTTOM_RIGHT] = 0x19,
- 0x20, 0x24, 0x03, 0x27, 0x2d,
- 0x06, 0x07, 0x29, 0x09, 0x2f,
- 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
- [GLOW_TILE_TOP_LEFT | GLOW_TILE_TOP_RIGHT] = 0x1a,
- 0x21, 0x24, 0x03, 0x04, 0x05,
- 0x06, 0x07,
- [GLOW_TILE_TOP_LEFT | GLOW_TILE_TOP_RIGHT | GLOW_TILE_BOTTOM] = 0x2b,
- 0x2e, 0x2f, 0x0b, 0x0c, 0x0d,
- 0x0e, 0x0f,
- [GLOW_TILE_TOP_LEFT | GLOW_TILE_TOP_RIGHT | GLOW_TILE_BOTTOM_RIGHT] = 0x1b,
- 0x22, 0x24, 0x03, 0x27, 0x2d,
- 0x06, 0x07, 0x2b, 0x2e, 0x2f,
- 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
- [GLOW_TILE_TOP_LEFT | GLOW_TILE_BOTTOM_LEFT] = 0x1c,
- 0x01,
- [GLOW_TILE_TOP_LEFT | GLOW_TILE_BOTTOM_LEFT | GLOW_TILE_RIGHT] = 0x25,
- 0x03, 0x26, 0x05, 0x2c, 0x07,
- 0x29, 0x09, 0x2f, 0x0b, 0x0c,
- 0x0d, 0x0e, 0x0f,
- [GLOW_TILE_TOP_LEFT | GLOW_TILE_BOTTOM_LEFT | GLOW_TILE_BOTTOM_RIGHT] = 0x1d,
- 0x20, 0x25, 0x03, 0x28, 0x2d,
- 0x2c, 0x07, 0x29, 0x09, 0x2f,
- 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
- [GLOW_TILE_TOP_LEFT | GLOW_TILE_BOTTOM_LEFT | GLOW_TILE_TOP_RIGHT] = 0x1e,
- 0x21, 0x25, 0x03, 0x26, 0x05,
- 0x2c, 0x07, 0x2b, 0x2e, 0x2f,
- 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
- [GLOW_TILE_TOP_LEFT | GLOW_TILE_BOTTOM_LEFT | GLOW_TILE_TOP_RIGHT | GLOW_TILE_BOTTOM_RIGHT] = 0x1f,
- 0x22, 0x25, 0x03, 0x28, 0x2d,
- 0x2c, 0x07, 0x2b, 0x2e, 0x2f,
- 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-};
+#include "data/pokedex_area_glow.h"
static const struct PokedexAreaMapTemplate sPokedexAreaMapTemplate =
{
@@ -238,13 +149,13 @@ static const struct PokedexAreaMapTemplate sPokedexAreaMapTemplate =
static const u8 sAreaMarkerTiles[];
static const struct SpriteSheet sAreaMarkerSpriteSheet =
{
- sAreaMarkerTiles, 0x80, 2
+ .data = sAreaMarkerTiles, .size = 0x80, .tag = TAG_AREA_MARKER
};
static const u16 sAreaMarkerPalette[];
static const struct SpritePalette sAreaMarkerSpritePalette =
{
- sAreaMarkerPalette, 2
+ .data = sAreaMarkerPalette, .tag = TAG_AREA_MARKER
};
static const struct OamData sAreaMarkerOamData =
@@ -256,13 +167,13 @@ static const struct OamData sAreaMarkerOamData =
static const struct SpriteTemplate sAreaMarkerSpriteTemplate =
{
- 2,
- 2,
- &sAreaMarkerOamData,
- gDummySpriteAnimTable,
- NULL,
- gDummySpriteAffineAnimTable,
- SpriteCallbackDummy
+ .tileTag = TAG_AREA_MARKER,
+ .paletteTag = TAG_AREA_MARKER,
+ .oam = &sAreaMarkerOamData,
+ .anims = gDummySpriteAnimTable,
+ .images = NULL,
+ .affineAnims = gDummySpriteAffineAnimTable,
+ .callback = SpriteCallbackDummy
};
static const u16 sAreaMarkerPalette[] = INCBIN_U16("graphics/pokedex/area_marker.gbapal");
@@ -270,7 +181,7 @@ static const u8 sAreaMarkerTiles[] = INCBIN_U8("graphics/pokedex/area_marker.4bp
static const struct SpritePalette sAreaUnknownSpritePalette =
{
- gPokedexAreaScreenAreaUnknown_Pal, 3
+ .data = gPokedexAreaScreenAreaUnknown_Pal, .tag = TAG_AREA_UNKNOWN
};
static const struct OamData sAreaUnknownOamData =
@@ -282,13 +193,13 @@ static const struct OamData sAreaUnknownOamData =
static const struct SpriteTemplate sAreaUnknownSpriteTemplate =
{
- 3,
- 3,
- &sAreaUnknownOamData,
- gDummySpriteAnimTable,
- NULL,
- gDummySpriteAffineAnimTable,
- SpriteCallbackDummy
+ .tileTag = TAG_AREA_UNKNOWN,
+ .paletteTag = TAG_AREA_UNKNOWN,
+ .oam = &sAreaUnknownOamData,
+ .anims = gDummySpriteAnimTable,
+ .images = NULL,
+ .affineAnims = gDummySpriteAffineAnimTable,
+ .callback = SpriteCallbackDummy
};
static void ResetDrawAreaGlowState(void)
@@ -308,17 +219,17 @@ static bool8 DrawAreaGlow(void)
break;
case 2:
DecompressAndCopyTileDataToVram(2, sAreaGlow_Gfx, 0, 0, 0);
- LoadBgTilemap(2, sPokedexAreaScreen->areaGlowTilemap, 0x500, 0);
+ LoadBgTilemap(2, sPokedexAreaScreen->areaGlowTilemap, sizeof(sPokedexAreaScreen->areaGlowTilemap), 0);
break;
case 3:
if (!FreeTempTileDataBuffersIfPossible())
{
- CpuCopy32(sAreaGlow_Pal, gPlttBufferUnfaded + 0xA0, 0x20);
+ CpuCopy32(sAreaGlow_Pal, &gPlttBufferUnfaded[GLOW_PALETTE * 16], sizeof(sAreaGlow_Pal));
sPokedexAreaScreen->drawAreaGlowState++;
}
return TRUE;
case 4:
- ChangeBgY(2, -0x800, BG_COORD_SET);
+ ChangeBgY(2, -BG_SCREEN_SIZE, BG_COORD_SET);
break;
default:
return FALSE;
@@ -333,58 +244,67 @@ static void FindMapsWithMon(u16 species)
u16 i;
struct Roamer *roamer;
- sPokedexAreaScreen->unk6E2 = 0;
- sPokedexAreaScreen->unk6E4 = VarGet(VAR_ALTERING_CAVE_WILD_SET);
- if (sPokedexAreaScreen->unk6E4 > 8)
- sPokedexAreaScreen->unk6E4 = 0;
+ sPokedexAreaScreen->alteringCaveCounter = 0;
+ sPokedexAreaScreen->alteringCaveId = VarGet(VAR_ALTERING_CAVE_WILD_SET);
+ if (sPokedexAreaScreen->alteringCaveId >= NUM_ALTERING_CAVE_TABLES)
+ sPokedexAreaScreen->alteringCaveId = 0;
roamer = &gSaveBlock1Ptr->roamer;
if (species != roamer->species)
{
sPokedexAreaScreen->numOverworldAreas = 0;
sPokedexAreaScreen->numSpecialAreas = 0;
+
+ // Check if this species should be hidden from the area map.
+ // This only applies to Wynaut, to hide the encounters on Mirage Island.
for (i = 0; i < ARRAY_COUNT(sSpeciesHiddenFromAreaScreen); i++)
{
if (sSpeciesHiddenFromAreaScreen[i] == species)
return;
}
+ // Add Pokémon with special encounter circumstances (i.e. not listed
+ // in the regular wild encounter table) to the area map.
+ // This only applies to Feebas on Route 119, but it was clearly set
+ // up to allow handling others.
for (i = 0; sFeebasData[i][0] != NUM_SPECIES; i++)
{
if (species == sFeebasData[i][0])
{
switch (sFeebasData[i][1])
{
- case MAP_GROUP_OVERWORLD_MONS:
- SetAreaHasMon(sFeebasData[i][1], sFeebasData[i][2]);
- break;
- case MAP_GROUP_SPECIAL_MONS_1:
- case MAP_GROUP_SPECIAL_MONS_2:
- SetSpecialMapHasMon(sFeebasData[i][1], sFeebasData[i][2]);
- break;
+ case MAP_GROUP_TOWNS_AND_ROUTES:
+ SetAreaHasMon(sFeebasData[i][1], sFeebasData[i][2]);
+ break;
+ case MAP_GROUP_DUNGEONS:
+ case MAP_GROUP_SPECIAL_AREA:
+ SetSpecialMapHasMon(sFeebasData[i][1], sFeebasData[i][2]);
+ break;
}
}
}
+ // Add regular species to the area map
for (i = 0; gWildMonHeaders[i].mapGroup != MAP_GROUP(UNDEFINED); i++)
{
- if (MapHasMon(&gWildMonHeaders[i], species))
+ if (MapHasSpecies(&gWildMonHeaders[i], species))
{
switch (gWildMonHeaders[i].mapGroup)
{
- case MAP_GROUP_OVERWORLD_MONS:
- SetAreaHasMon(gWildMonHeaders[i].mapGroup, gWildMonHeaders[i].mapNum);
- break;
- case MAP_GROUP_SPECIAL_MONS_1:
- case MAP_GROUP_SPECIAL_MONS_2:
- SetSpecialMapHasMon(gWildMonHeaders[i].mapGroup, gWildMonHeaders[i].mapNum);
- break;
+ case MAP_GROUP_TOWNS_AND_ROUTES:
+ SetAreaHasMon(gWildMonHeaders[i].mapGroup, gWildMonHeaders[i].mapNum);
+ break;
+ case MAP_GROUP_DUNGEONS:
+ case MAP_GROUP_SPECIAL_AREA:
+ SetSpecialMapHasMon(gWildMonHeaders[i].mapGroup, gWildMonHeaders[i].mapNum);
+ break;
}
}
}
}
else
{
+ // This is the roamer's species, show where the roamer is currently
sPokedexAreaScreen->numSpecialAreas = 0;
if (roamer->active)
{
@@ -401,7 +321,7 @@ static void FindMapsWithMon(u16 species)
static void SetAreaHasMon(u16 mapGroup, u16 mapNum)
{
- if (sPokedexAreaScreen->numOverworldAreas < 0x40)
+ if (sPokedexAreaScreen->numOverworldAreas < MAX_AREA_HIGHLIGHTS)
{
sPokedexAreaScreen->overworldAreasWithMons[sPokedexAreaScreen->numOverworldAreas].mapGroup = mapGroup;
sPokedexAreaScreen->overworldAreasWithMons[sPokedexAreaScreen->numOverworldAreas].mapNum = mapNum;
@@ -414,23 +334,26 @@ static void SetSpecialMapHasMon(u16 mapGroup, u16 mapNum)
{
int i;
- if (sPokedexAreaScreen->numSpecialAreas < 0x20)
+ if (sPokedexAreaScreen->numSpecialAreas < MAX_AREA_MARKERS)
{
u16 regionMapSectionId = GetRegionMapSectionId(mapGroup, mapNum);
if (regionMapSectionId < MAPSEC_NONE)
{
+ // Don't highlight the area if it's a moving area (Marine/Terra Cave)
for (i = 0; i < ARRAY_COUNT(sMovingRegionMapSections); i++)
{
if (regionMapSectionId == sMovingRegionMapSections[i])
return;
}
+ // Don't highlight the area if it's an undiscovered landmark (e.g. Sky Pillar)
for (i = 0; sLandmarkData[i][0] != MAPSEC_NONE; i++)
{
if (regionMapSectionId == sLandmarkData[i][0] && !FlagGet(sLandmarkData[i][1]))
return;
}
+ // Check if this special area is already being tracked
for (i = 0; i < sPokedexAreaScreen->numSpecialAreas; i++)
{
if (sPokedexAreaScreen->specialAreaRegionMapSectionIds[i] == regionMapSectionId)
@@ -439,6 +362,7 @@ static void SetSpecialMapHasMon(u16 mapGroup, u16 mapNum)
if (i == sPokedexAreaScreen->numSpecialAreas)
{
+ // New special area
sPokedexAreaScreen->specialAreaRegionMapSectionIds[i] = regionMapSectionId;
sPokedexAreaScreen->numSpecialAreas++;
}
@@ -451,27 +375,34 @@ static u16 GetRegionMapSectionId(u8 mapGroup, u8 mapNum)
return Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum)->regionMapSectionId;
}
-static bool8 MapHasMon(const struct WildPokemonHeader *info, u16 species)
+static bool8 MapHasSpecies(const struct WildPokemonHeader *info, u16 species)
{
+ // If this is a header for Altering Cave, skip it if it's not the current Altering Cave encounter set
if (GetRegionMapSectionId(info->mapGroup, info->mapNum) == MAPSEC_ALTERING_CAVE)
{
- sPokedexAreaScreen->unk6E2++;
- if (sPokedexAreaScreen->unk6E2 != sPokedexAreaScreen->unk6E4 + 1)
+ sPokedexAreaScreen->alteringCaveCounter++;
+ if (sPokedexAreaScreen->alteringCaveCounter != sPokedexAreaScreen->alteringCaveId + 1)
return FALSE;
}
- if (MonListHasMon(info->landMonsInfo, species, 12))
+ if (MonListHasSpecies(info->landMonsInfo, species, LAND_WILD_COUNT))
return TRUE;
- if (MonListHasMon(info->waterMonsInfo, species, 5))
+ if (MonListHasSpecies(info->waterMonsInfo, species, WATER_WILD_COUNT))
return TRUE;
- if (MonListHasMon(info->fishingMonsInfo, species, 12))
+// When searching the fishing encounters, this incorrectly uses the size of the land encounters.
+// As a result it's reading out of bounds of the fishing encounters tables.
+#ifdef BUGFIX
+ if (MonListHasSpecies(info->fishingMonsInfo, species, FISH_WILD_COUNT))
+#else
+ if (MonListHasSpecies(info->fishingMonsInfo, species, LAND_WILD_COUNT))
+#endif
return TRUE;
- if (MonListHasMon(info->rockSmashMonsInfo, species, 5))
+ if (MonListHasSpecies(info->rockSmashMonsInfo, species, ROCK_WILD_COUNT))
return TRUE;
return FALSE;
}
-static bool8 MonListHasMon(const struct WildPokemonInfo *info, u16 species, u16 size)
+static bool8 MonListHasSpecies(const struct WildPokemonInfo *info, u16 species, u16 size)
{
u16 i;
if (info != NULL)
@@ -489,9 +420,12 @@ static void BuildAreaGlowTilemap(void)
{
u16 i, y, x, j;
+ // Reset tilemap
for (i = 0; i < ARRAY_COUNT(sPokedexAreaScreen->areaGlowTilemap); i++)
sPokedexAreaScreen->areaGlowTilemap[i] = 0;
+ // For each area with this species, scan the region map layout and find any locations that have a matching mapsec.
+ // Add a "full glow" indicator for these matching spaces.
for (i = 0; i < sPokedexAreaScreen->numOverworldAreas; i++)
{
j = 0;
@@ -500,69 +434,73 @@ static void BuildAreaGlowTilemap(void)
for (x = 0; x < AREA_SCREEN_WIDTH; x++)
{
if (GetRegionMapSecIdAt(x, y) == sPokedexAreaScreen->overworldAreasWithMons[i].regionMapSectionId)
- sPokedexAreaScreen->areaGlowTilemap[j] = GLOW_TILE_FULL;
-
+ sPokedexAreaScreen->areaGlowTilemap[j] = GLOW_FULL;
j++;
}
}
}
+ // Scan the tilemap. For every "full glow" indicator added above, fill in its edges and corners.
j = 0;
for (y = 0; y < AREA_SCREEN_HEIGHT; y++)
{
for (x = 0; x < AREA_SCREEN_WIDTH; x++)
{
- if (sPokedexAreaScreen->areaGlowTilemap[j] == GLOW_TILE_FULL)
+ if (sPokedexAreaScreen->areaGlowTilemap[j] == GLOW_FULL)
{
- // The "tile != GLOW_TILE_FULL" check is pointless in all of these conditionals,
+ // The "tile != GLOW_FULL" check is pointless in all of these conditionals,
// since there's no harm in OR'ing 0xFFFF with anything else.
// Edges
- if (x != 0 && sPokedexAreaScreen->areaGlowTilemap[j - 1] != GLOW_TILE_FULL)
- sPokedexAreaScreen->areaGlowTilemap[j - 1] |= GLOW_TILE_RIGHT;
- if (x != AREA_SCREEN_WIDTH - 1 && sPokedexAreaScreen->areaGlowTilemap[j + 1] != GLOW_TILE_FULL)
- sPokedexAreaScreen->areaGlowTilemap[j + 1] |= GLOW_TILE_LEFT;
- if (y != 0 && sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH] != GLOW_TILE_FULL)
- sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH] |= GLOW_TILE_BOTTOM;
- if (y != AREA_SCREEN_HEIGHT - 1 && sPokedexAreaScreen->areaGlowTilemap[j + AREA_SCREEN_WIDTH] != GLOW_TILE_FULL)
- sPokedexAreaScreen->areaGlowTilemap[j + AREA_SCREEN_WIDTH] |= GLOW_TILE_TOP;
-
- // Diagonals
- if (x != 0 && y != 0 && sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH - 1] != GLOW_TILE_FULL)
- sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH - 1] |= GLOW_TILE_BOTTOM_RIGHT;
- if (x != AREA_SCREEN_WIDTH - 1 && y != 0 && sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH + 1] != GLOW_TILE_FULL)
- sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH + 1] |= GLOW_TILE_BOTTOM_LEFT;
- if (x != 0 && y != AREA_SCREEN_HEIGHT - 1 && sPokedexAreaScreen->areaGlowTilemap[j + AREA_SCREEN_WIDTH - 1] != GLOW_TILE_FULL)
- sPokedexAreaScreen->areaGlowTilemap[j + AREA_SCREEN_WIDTH - 1] |= GLOW_TILE_TOP_RIGHT;
- if (x != AREA_SCREEN_WIDTH - 1 && y != AREA_SCREEN_HEIGHT - 1 && sPokedexAreaScreen->areaGlowTilemap[j + AREA_SCREEN_WIDTH + 1] != GLOW_TILE_FULL)
- sPokedexAreaScreen->areaGlowTilemap[j + AREA_SCREEN_WIDTH + 1] |= GLOW_TILE_TOP_LEFT;
+ if (x != 0 && sPokedexAreaScreen->areaGlowTilemap[j - 1] != GLOW_FULL)
+ sPokedexAreaScreen->areaGlowTilemap[j - 1] |= GLOW_EDGE_L;
+ if (x != AREA_SCREEN_WIDTH - 1 && sPokedexAreaScreen->areaGlowTilemap[j + 1] != GLOW_FULL)
+ sPokedexAreaScreen->areaGlowTilemap[j + 1] |= GLOW_EDGE_R;
+ if (y != 0 && sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH] != GLOW_FULL)
+ sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH] |= GLOW_EDGE_T;
+ if (y != AREA_SCREEN_HEIGHT - 1 && sPokedexAreaScreen->areaGlowTilemap[j + AREA_SCREEN_WIDTH] != GLOW_FULL)
+ sPokedexAreaScreen->areaGlowTilemap[j + AREA_SCREEN_WIDTH] |= GLOW_EDGE_B;
+
+ // Corners
+ if (x != 0 && y != 0 && sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH - 1] != GLOW_FULL)
+ sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH - 1] |= GLOW_CORNER_TL;
+ if (x != AREA_SCREEN_WIDTH - 1 && y != 0 && sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH + 1] != GLOW_FULL)
+ sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH + 1] |= GLOW_CORNER_TR;
+ if (x != 0 && y != AREA_SCREEN_HEIGHT - 1 && sPokedexAreaScreen->areaGlowTilemap[j + AREA_SCREEN_WIDTH - 1] != GLOW_FULL)
+ sPokedexAreaScreen->areaGlowTilemap[j + AREA_SCREEN_WIDTH - 1] |= GLOW_CORNER_BL;
+ if (x != AREA_SCREEN_WIDTH - 1 && y != AREA_SCREEN_HEIGHT - 1 && sPokedexAreaScreen->areaGlowTilemap[j + AREA_SCREEN_WIDTH + 1] != GLOW_FULL)
+ sPokedexAreaScreen->areaGlowTilemap[j + AREA_SCREEN_WIDTH + 1] |= GLOW_CORNER_BR;
}
j++;
}
}
+ // Scan the tilemap again. Replace the "full tile" indicators with the actual tile id,
+ // and remove corner flags when they're overlapped by an edge.
for (i = 0; i < ARRAY_COUNT(sPokedexAreaScreen->areaGlowTilemap); i++)
{
- if (sPokedexAreaScreen->areaGlowTilemap[i] == GLOW_TILE_FULL)
+ if (sPokedexAreaScreen->areaGlowTilemap[i] == GLOW_FULL)
{
- sPokedexAreaScreen->areaGlowTilemap[i] = 0x10;
- sPokedexAreaScreen->areaGlowTilemap[i] |= 0xA000;
+ sPokedexAreaScreen->areaGlowTilemap[i] = GLOW_TILE_FULL;
+ sPokedexAreaScreen->areaGlowTilemap[i] |= (GLOW_PALETTE << 12);
}
else if (sPokedexAreaScreen->areaGlowTilemap[i])
{
- // Get rid of overlapping flags
- if (sPokedexAreaScreen->areaGlowTilemap[i] & GLOW_TILE_RIGHT)
- sPokedexAreaScreen->areaGlowTilemap[i] &= ~(GLOW_TILE_BOTTOM_RIGHT | GLOW_TILE_TOP_RIGHT);
- if (sPokedexAreaScreen->areaGlowTilemap[i] & GLOW_TILE_LEFT)
- sPokedexAreaScreen->areaGlowTilemap[i] &= ~(GLOW_TILE_BOTTOM_LEFT | GLOW_TILE_TOP_LEFT);
- if (sPokedexAreaScreen->areaGlowTilemap[i] & GLOW_TILE_BOTTOM)
- sPokedexAreaScreen->areaGlowTilemap[i] &= ~(GLOW_TILE_BOTTOM_LEFT | GLOW_TILE_BOTTOM_RIGHT);
- if (sPokedexAreaScreen->areaGlowTilemap[i] & GLOW_TILE_TOP)
- sPokedexAreaScreen->areaGlowTilemap[i] &= ~(GLOW_TILE_TOP_LEFT | GLOW_TILE_TOP_RIGHT);
-
+ // Get rid of overlapping flags.
+ // This is pointless, as sAreaGlowTilemapMapping can handle overlaps.
+ if (sPokedexAreaScreen->areaGlowTilemap[i] & GLOW_EDGE_L)
+ sPokedexAreaScreen->areaGlowTilemap[i] &= ~(GLOW_CORNER_TL | GLOW_CORNER_BL);
+ if (sPokedexAreaScreen->areaGlowTilemap[i] & GLOW_EDGE_R)
+ sPokedexAreaScreen->areaGlowTilemap[i] &= ~(GLOW_CORNER_TR | GLOW_CORNER_BR);
+ if (sPokedexAreaScreen->areaGlowTilemap[i] & GLOW_EDGE_T)
+ sPokedexAreaScreen->areaGlowTilemap[i] &= ~(GLOW_CORNER_TR | GLOW_CORNER_TL);
+ if (sPokedexAreaScreen->areaGlowTilemap[i] & GLOW_EDGE_B)
+ sPokedexAreaScreen->areaGlowTilemap[i] &= ~(GLOW_CORNER_BR | GLOW_CORNER_BL);
+
+ // Assign tile id
sPokedexAreaScreen->areaGlowTilemap[i] = sAreaGlowTilemapMapping[sPokedexAreaScreen->areaGlowTilemap[i]];
- sPokedexAreaScreen->areaGlowTilemap[i] |= 0xA000;
+ sPokedexAreaScreen->areaGlowTilemap[i] |= (GLOW_PALETTE << 12);
}
}
}
@@ -570,15 +508,15 @@ static void BuildAreaGlowTilemap(void)
static void StartAreaGlow(void)
{
if (sPokedexAreaScreen->numSpecialAreas && sPokedexAreaScreen->numOverworldAreas == 0)
- sPokedexAreaScreen->whichMarkersFlashing = 1;
+ sPokedexAreaScreen->showingMarkers = TRUE;
else
- sPokedexAreaScreen->whichMarkersFlashing = 0;
+ sPokedexAreaScreen->showingMarkers = FALSE;
- sPokedexAreaScreen->areaShadeOrMarkerFrameCounter = 0;
- sPokedexAreaScreen->areaShadeFrameCounter = 0;
+ sPokedexAreaScreen->markerTimer = 0;
+ sPokedexAreaScreen->glowTimer = 0;
sPokedexAreaScreen->areaShadeBldArgLo = 0;
- sPokedexAreaScreen->areaShadeBldArgHi = 0x40;
- sPokedexAreaScreen->specialMarkerCycleCounter = 1;
+ sPokedexAreaScreen->areaShadeBldArgHi = 64;
+ sPokedexAreaScreen->markerFlashCounter = 1;
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG2 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL);
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
DoAreaGlow();
@@ -589,12 +527,13 @@ static void DoAreaGlow(void)
u16 x, y;
u16 i;
- if (sPokedexAreaScreen->whichMarkersFlashing == 0)
+ if (!sPokedexAreaScreen->showingMarkers)
{
- if (sPokedexAreaScreen->areaShadeOrMarkerFrameCounter == 0)
+ // Showing area glow
+ if (sPokedexAreaScreen->markerTimer == 0)
{
- sPokedexAreaScreen->areaShadeFrameCounter++;
- if (sPokedexAreaScreen->areaShadeFrameCounter & 1)
+ sPokedexAreaScreen->glowTimer++;
+ if (sPokedexAreaScreen->glowTimer & 1)
sPokedexAreaScreen->areaShadeBldArgLo = (sPokedexAreaScreen->areaShadeBldArgLo + 4) & 0x7f;
else
sPokedexAreaScreen->areaShadeBldArgHi = (sPokedexAreaScreen->areaShadeBldArgHi + 4) & 0x7f;
@@ -602,32 +541,38 @@ static void DoAreaGlow(void)
x = gSineTable[sPokedexAreaScreen->areaShadeBldArgLo] >> 4;
y = gSineTable[sPokedexAreaScreen->areaShadeBldArgHi] >> 4;
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(x, y));
- sPokedexAreaScreen->areaShadeOrMarkerFrameCounter = 0;
- if (sPokedexAreaScreen->areaShadeFrameCounter == 0x40)
+ sPokedexAreaScreen->markerTimer = 0;
+ if (sPokedexAreaScreen->glowTimer == 64)
{
- sPokedexAreaScreen->areaShadeFrameCounter = 0;
+ // Done glowing, reset and try to switch to the special area markers
+ sPokedexAreaScreen->glowTimer = 0;
if (sPokedexAreaScreen->numSpecialAreas != 0)
- sPokedexAreaScreen->whichMarkersFlashing = 1;
+ sPokedexAreaScreen->showingMarkers = TRUE;
}
}
else
- sPokedexAreaScreen->areaShadeOrMarkerFrameCounter--;
+ sPokedexAreaScreen->markerTimer--;
}
else
{
- sPokedexAreaScreen->areaShadeOrMarkerFrameCounter++;
- if (sPokedexAreaScreen->areaShadeOrMarkerFrameCounter > 12)
+ // Showing special area markers
+ sPokedexAreaScreen->markerTimer++;
+ if (sPokedexAreaScreen->markerTimer > 12)
{
- sPokedexAreaScreen->areaShadeOrMarkerFrameCounter = 0;
- sPokedexAreaScreen->specialMarkerCycleCounter++;
+ sPokedexAreaScreen->markerTimer = 0;
+
+ // Flash the marker
+ // With a max of 4, the marker will disappear twice
+ sPokedexAreaScreen->markerFlashCounter++;
for (i = 0; i < sPokedexAreaScreen->numSpecialAreas; i++)
- sPokedexAreaScreen->areaMarkerSprites[i]->invisible = sPokedexAreaScreen->specialMarkerCycleCounter & 1;
+ sPokedexAreaScreen->areaMarkerSprites[i]->invisible = sPokedexAreaScreen->markerFlashCounter & 1;
- if (sPokedexAreaScreen->specialMarkerCycleCounter > 4)
+ if (sPokedexAreaScreen->markerFlashCounter > 4)
{
- sPokedexAreaScreen->specialMarkerCycleCounter = 1;
+ // Done flashing, reset and try to switch to the area glow
+ sPokedexAreaScreen->markerFlashCounter = 1;
if (sPokedexAreaScreen->numOverworldAreas != 0)
- sPokedexAreaScreen->whichMarkersFlashing = 0;
+ sPokedexAreaScreen->showingMarkers = FALSE;
}
}
}
@@ -651,58 +596,58 @@ static void Task_ShowPokedexAreaScreen(u8 taskId)
{
switch (gTasks[taskId].tState)
{
- case 0:
- ResetSpriteData();
- FreeAllSpritePalettes();
- HideBg(3);
- HideBg(2);
- HideBg(0);
- break;
- case 1:
- SetBgAttribute(3, BG_ATTR_CHARBASEINDEX, 3);
- LoadPokedexAreaMapGfx(&sPokedexAreaMapTemplate);
- StringFill(sPokedexAreaScreen->charBuffer, CHAR_SPACE, 16);
- break;
- case 2:
- if (TryShowPokedexAreaMap() == TRUE)
- return;
- PokedexAreaMapChangeBgY(-8);
- break;
- case 3:
- ResetDrawAreaGlowState();
- break;
- case 4:
- if (DrawAreaGlow())
- return;
- break;
- case 5:
- ShowRegionMapForPokedexAreaScreen(&sPokedexAreaScreen->regionMap);
- CreateRegionMapPlayerIcon(1, 1);
- PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs(0, -8);
- break;
- case 6:
- CreateAreaMarkerSprites();
- break;
- case 7:
- LoadAreaUnknownGraphics();
- break;
- case 8:
- CreateAreaUnknownSprites();
- break;
- case 9:
- BeginNormalPaletteFade(PALETTES_ALL & ~(0x14), 0, 16, 0, RGB(0, 0, 0));
- break;
- case 10:
- SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_ALL);
- StartAreaGlow();
- ShowBg(2);
- ShowBg(3); // TryShowPokedexAreaMap will have done this already
- SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON);
- break;
- case 11:
- gTasks[taskId].func = Task_HandlePokedexAreaScreenInput;
- gTasks[taskId].tState = 0;
+ case 0:
+ ResetSpriteData();
+ FreeAllSpritePalettes();
+ HideBg(3);
+ HideBg(2);
+ HideBg(0);
+ break;
+ case 1:
+ SetBgAttribute(3, BG_ATTR_CHARBASEINDEX, 3);
+ LoadPokedexAreaMapGfx(&sPokedexAreaMapTemplate);
+ StringFill(sPokedexAreaScreen->charBuffer, CHAR_SPACE, 16);
+ break;
+ case 2:
+ if (TryShowPokedexAreaMap() == TRUE)
return;
+ PokedexAreaMapChangeBgY(-8);
+ break;
+ case 3:
+ ResetDrawAreaGlowState();
+ break;
+ case 4:
+ if (DrawAreaGlow())
+ return;
+ break;
+ case 5:
+ ShowRegionMapForPokedexAreaScreen(&sPokedexAreaScreen->regionMap);
+ CreateRegionMapPlayerIcon(1, 1);
+ PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs(0, -8);
+ break;
+ case 6:
+ CreateAreaMarkerSprites();
+ break;
+ case 7:
+ LoadAreaUnknownGraphics();
+ break;
+ case 8:
+ CreateAreaUnknownSprites();
+ break;
+ case 9:
+ BeginNormalPaletteFade(PALETTES_ALL & ~(0x14), 0, 16, 0, RGB_BLACK);
+ break;
+ case 10:
+ SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_ALL);
+ StartAreaGlow();
+ ShowBg(2);
+ ShowBg(3); // TryShowPokedexAreaMap will have done this already
+ SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON);
+ break;
+ case 11:
+ gTasks[taskId].func = Task_HandlePokedexAreaScreenInput;
+ gTasks[taskId].tState = 0;
+ return;
}
gTasks[taskId].tState++;
@@ -740,7 +685,7 @@ static void Task_HandlePokedexAreaScreenInput(u8 taskId)
case 3:
if (gPaletteFade.active)
return;
- DestroyAreaMarkerSprites();
+ DestroyAreaScreenSprites();
sPokedexAreaScreen->screenSwitchState[0] = gTasks[taskId].data[1];
ResetPokedexAreaMapBg();
DestroyTask(taskId);
@@ -758,6 +703,7 @@ static void ResetPokedexAreaMapBg(void)
SetBgAttribute(3, BG_ATTR_PALETTEMODE, 0);
}
+// Creates the circular sprites to highlight special areas (like caves) where a Pokémon can be found
static void CreateAreaMarkerSprites(void)
{
u8 spriteId;
@@ -788,17 +734,20 @@ static void CreateAreaMarkerSprites(void)
sPokedexAreaScreen->numAreaMarkerSprites = numSprites;
}
-static void DestroyAreaMarkerSprites(void)
+static void DestroyAreaScreenSprites(void)
{
u16 i;
- FreeSpriteTilesByTag(2);
- FreeSpritePaletteByTag(2);
+
+ // Destroy area marker sprites
+ FreeSpriteTilesByTag(TAG_AREA_MARKER);
+ FreeSpritePaletteByTag(TAG_AREA_MARKER);
for (i = 0; i < sPokedexAreaScreen->numAreaMarkerSprites; i++)
DestroySprite(sPokedexAreaScreen->areaMarkerSprites[i]);
- FreeSpriteTilesByTag(3);
- FreeSpritePaletteByTag(3);
- for (i = 0; i < 3; i++)
+ // Destroy "Area Unknown" sprites
+ FreeSpriteTilesByTag(TAG_AREA_UNKNOWN);
+ FreeSpritePaletteByTag(TAG_AREA_UNKNOWN);
+ for (i = 0; i < ARRAY_COUNT(sPokedexAreaScreen->areaUnknownSprites); i++)
{
if (sPokedexAreaScreen->areaUnknownSprites[i])
DestroySprite(sPokedexAreaScreen->areaUnknownSprites[i]);
@@ -809,8 +758,8 @@ static void LoadAreaUnknownGraphics(void)
{
struct SpriteSheet spriteSheet = {
.data = sPokedexAreaScreen->areaUnknownGraphicsBuffer,
- .size = 0x600,
- .tag = 3,
+ .size = sizeof(sPokedexAreaScreen->areaUnknownGraphicsBuffer),
+ .tag = TAG_AREA_UNKNOWN,
};
LZ77UnCompWram(gPokedexAreaScreenAreaUnknown_Gfx, sPokedexAreaScreen->areaUnknownGraphicsBuffer);
LoadSpriteSheet(&spriteSheet);
@@ -820,25 +769,27 @@ static void LoadAreaUnknownGraphics(void)
static void CreateAreaUnknownSprites(void)
{
u16 i;
- u8 spriteId;
if (sPokedexAreaScreen->numOverworldAreas || sPokedexAreaScreen->numSpecialAreas)
{
- for (i = 0; i < 3; i++)
+ // The current species is present on the map, don't create any "Area Unknown" sprites
+ for (i = 0; i < ARRAY_COUNT(sPokedexAreaScreen->areaUnknownSprites); i++)
sPokedexAreaScreen->areaUnknownSprites[i] = NULL;
}
else
{
- for (i = 0; i < 3; i++)
+ // The current species is absent on the map, try to create "Area Unknown" sprites
+ for (i = 0; i < ARRAY_COUNT(sPokedexAreaScreen->areaUnknownSprites); i++)
{
- spriteId = CreateSprite(&sAreaUnknownSpriteTemplate, i * 32 + 0xa0, 0x8c, 0);
+ u8 spriteId = CreateSprite(&sAreaUnknownSpriteTemplate, i * 32 + 160, 140, 0);
if (spriteId != MAX_SPRITES)
{
gSprites[spriteId].oam.tileNum += i * 16;
- sPokedexAreaScreen->areaUnknownSprites[i] = gSprites + spriteId;
+ sPokedexAreaScreen->areaUnknownSprites[i] = &gSprites[spriteId];
}
else
{
+ // Failed to create sprite
sPokedexAreaScreen->areaUnknownSprites[i] = NULL;
}
}
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"
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 5960692a2..4b3402e5a 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -45,6 +45,8 @@ enum {
#define WILD_CHECK_REPEL (1 << 0)
#define WILD_CHECK_KEEN_EYE (1 << 1)
+#define HEADER_NONE 0xFFFF
+
static u16 FeebasRandom(void);
static void FeebasSeedRng(u16 seed);
static bool8 IsWildLevelAllowedByRepel(u8 level);
@@ -172,6 +174,7 @@ static void FeebasSeedRng(u16 seed)
sFeebasRngValue = seed;
}
+// LAND_WILD_COUNT
static u8 ChooseWildMonIndex_Land(void)
{
u8 rand = Random() % ENCOUNTER_CHANCE_LAND_MONS_TOTAL;
@@ -202,6 +205,7 @@ static u8 ChooseWildMonIndex_Land(void)
return 11;
}
+// ROCK_WILD_COUNT / WATER_WILD_COUNT
static u8 ChooseWildMonIndex_WaterRock(void)
{
u8 rand = Random() % ENCOUNTER_CHANCE_WATER_MONS_TOTAL;
@@ -218,6 +222,7 @@ static u8 ChooseWildMonIndex_WaterRock(void)
return 4;
}
+// FISH_WILD_COUNT
static u8 ChooseWildMonIndex_Fishing(u8 rod)
{
u8 wildMonIndex = 0;
@@ -310,7 +315,7 @@ static u16 GetCurrentMapWildMonHeaderId(void)
gSaveBlock1Ptr->location.mapNum == MAP_NUM(ALTERING_CAVE))
{
u16 alteringCaveId = VarGet(VAR_ALTERING_CAVE_WILD_SET);
- if (alteringCaveId > 8)
+ if (alteringCaveId >= NUM_ALTERING_CAVE_TABLES)
alteringCaveId = 0;
i += alteringCaveId;
@@ -320,7 +325,7 @@ static u16 GetCurrentMapWildMonHeaderId(void)
}
}
- return -1;
+ return HEADER_NONE;
}
static u8 PickWildMonNature(void)
@@ -541,7 +546,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi
return FALSE;
headerId = GetCurrentMapWildMonHeaderId();
- if (headerId == 0xFFFF)
+ if (headerId == HEADER_NONE)
{
if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS)
{
@@ -652,7 +657,7 @@ void RockSmashWildEncounter(void)
{
u16 headerId = GetCurrentMapWildMonHeaderId();
- if (headerId != 0xFFFF)
+ if (headerId != HEADER_NONE)
{
const struct WildPokemonInfo *wildPokemonInfo = gWildMonHeaders[headerId].rockSmashMonsInfo;
@@ -684,7 +689,7 @@ bool8 SweetScentWildEncounter(void)
PlayerGetDestCoords(&x, &y);
headerId = GetCurrentMapWildMonHeaderId();
- if (headerId == 0xFFFF)
+ if (headerId == HEADER_NONE)
{
if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS)
{
@@ -754,7 +759,7 @@ bool8 DoesCurrentMapHaveFishingMons(void)
{
u16 headerId = GetCurrentMapWildMonHeaderId();
- if (headerId != 0xFFFF && gWildMonHeaders[headerId].fishingMonsInfo != NULL)
+ if (headerId != HEADER_NONE && gWildMonHeaders[headerId].fishingMonsInfo != NULL)
return TRUE;
else
return FALSE;
@@ -788,7 +793,7 @@ u16 GetLocalWildMon(bool8 *isWaterMon)
*isWaterMon = FALSE;
headerId = GetCurrentMapWildMonHeaderId();
- if (headerId == 0xFFFF)
+ if (headerId == HEADER_NONE)
return SPECIES_NONE;
landMonsInfo = gWildMonHeaders[headerId].landMonsInfo;
waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo;
@@ -820,7 +825,7 @@ u16 GetLocalWaterMon(void)
{
u16 headerId = GetCurrentMapWildMonHeaderId();
- if (headerId != 0xFFFF)
+ if (headerId != HEADER_NONE)
{
const struct WildPokemonInfo *waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 14:54:28 +0000