ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update constants

Browse Source
This commit is contained in:
Slawter666 2019-01-05 20:12:50 +00:00
parent f8c2fcb9b2
commit aeaf390706
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/constants/secret_bases.h
View File

@ -1,6 +1,13 @@
#ifndef GUARD_CONSTANTS_SECRET_BASES_H #ifndef GUARD_CONSTANTS_SECRET_BASES_H
#define GUARD_CONSTANTS_SECRET_BASES_H #define GUARD_CONSTANTS_SECRET_BASES_H
#define SECRET_BASE_RED_CAVE 1
#define SECRET_BASE_BROWN_CAVE 2
#define SECRET_BASE_BLUE_CAVE 3
#define SECRET_BASE_YELLOW_CAVE 4
#define SECRET_BASE_TREE 5
#define SECRET_BASE_SHRUB 6
// Each secret base location is assigned an identifier value. // Each secret base location is assigned an identifier value.
// The secret base's map is determined by (id / 10). The ones // The secret base's map is determined by (id / 10). The ones
// digit is used to differentiate secret bases using the same map. // digit is used to differentiate secret bases using the same map.

21
src/secret_base.c
View File

@ -38,6 +38,7 @@
#include "constants/maps.h" #include "constants/maps.h"
#include "constants/map_types.h" #include "constants/map_types.h"
#include "constants/metatile_behaviors.h" #include "constants/metatile_behaviors.h"
#include "constants/secret_bases.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/trainers.h" #include "constants/trainers.h"
@ -217,27 +218,27 @@ u8 sub_80E8BF8(void)
behavior = MapGridGetMetatileBehaviorAt(x, y) & 0xFFF; behavior = MapGridGetMetatileBehaviorAt(x, y) & 0xFFF;
if (behavior == MB_SECRET_BASE_SPOT_RED_CAVE || behavior == MB_SECRET_BASE_SPOT_RED_CAVE_OPEN) if (behavior == MB_SECRET_BASE_SPOT_RED_CAVE || behavior == MB_SECRET_BASE_SPOT_RED_CAVE_OPEN)
{ {
return 1; return SECRET_BASE_RED_CAVE;
} }
if (behavior == MB_SECRET_BASE_SPOT_BROWN_CAVE || behavior == MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN) if (behavior == MB_SECRET_BASE_SPOT_BROWN_CAVE || behavior == MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN)
{ {
return 2; return SECRET_BASE_BROWN_CAVE;
} }
if (behavior == MB_SECRET_BASE_SPOT_BLUE_CAVE || behavior == MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN) if (behavior == MB_SECRET_BASE_SPOT_BLUE_CAVE || behavior == MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN)
{ {
return 3; return SECRET_BASE_BLUE_CAVE;
} }
if (behavior == MB_SECRET_BASE_SPOT_YELLOW_CAVE || behavior == MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN) if (behavior == MB_SECRET_BASE_SPOT_YELLOW_CAVE || behavior == MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN)
{ {
return 4; return SECRET_BASE_YELLOW_CAVE;
} }
if (behavior == MB_SECRET_BASE_SPOT_TREE_LEFT || behavior == MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN || behavior == MB_SECRET_BASE_SPOT_TREE_RIGHT || behavior == MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN) if (behavior == MB_SECRET_BASE_SPOT_TREE_LEFT || behavior == MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN || behavior == MB_SECRET_BASE_SPOT_TREE_RIGHT || behavior == MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN)
{ {
return 5; return SECRET_BASE_TREE;
} }
if (behavior == MB_SECRET_BASE_SPOT_SHRUB || behavior == MB_SECRET_BASE_SPOT_SHRUB_OPEN) if (behavior == MB_SECRET_BASE_SPOT_SHRUB || behavior == MB_SECRET_BASE_SPOT_SHRUB_OPEN)
{ {
return 6; return SECRET_BASE_SHRUB;
} }
return 0; return 0;
} }
@ -846,7 +847,7 @@ void sub_80E9BDC(void)
void sub_80E9C2C(void) void sub_80E9C2C(void)
{ {
gSaveBlock1Ptr->secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].sbr_field_1_6 ^= 1; gSaveBlock1Ptr->secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].sbr_field_1_6 ^= 1;
FlagSet(FLAG_0x10C); FlagSet(FLAG_DECORATION_16);
} }
void sub_80E9C74(void) void sub_80E9C74(void)
@ -1159,13 +1160,13 @@ void sub_80EA354(void)
u8 i; u8 i;
secretBaseRecordId = VarGet(VAR_CURRENT_SECRET_BASE); secretBaseRecordId = VarGet(VAR_CURRENT_SECRET_BASE);
if (!FlagGet(FLAG_0x922)) if (!FlagGet(FLAG_DAILY_SECRET_BASE))
{ {
for (i = 0; i < SECRET_BASES_COUNT; i ++) for (i = 0; i < SECRET_BASES_COUNT; i ++)
{ {
gSaveBlock1Ptr->secretBases[i].sbr_field_1_5 = FALSE; gSaveBlock1Ptr->secretBases[i].sbr_field_1_5 = FALSE;
} }
FlagSet(FLAG_0x922); FlagSet(FLAG_DAILY_SECRET_BASE);
} }
gSpecialVar_0x8004 = sub_80EA20C(secretBaseRecordId); gSpecialVar_0x8004 = sub_80EA20C(secretBaseRecordId);
gSpecialVar_Result = gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_5; gSpecialVar_Result = gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_5;
@ -1681,7 +1682,7 @@ void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx)
struct SecretBaseRecordMixer mixers[3]; struct SecretBaseRecordMixer mixers[3];
u16 i; u16 i;
if (FlagGet(FLAG_0x060)) if (FlagGet(FLAG_RECEIVED_SECRET_POWER))
{ {
switch (GetLinkPlayerCount()) switch (GetLinkPlayerCount())
{ {