diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.inc.h | 2 | ||||
| -rw-r--r-- | include/pokemon.h | 6 | ||||
| -rw-r--r-- | include/rom4.h | 2 | ||||
| -rw-r--r-- | include/vars.h | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index d0fe6e354..416917fa6 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -356,7 +356,7 @@ s16 sub_810CAE4(u8, struct Pokeblock *); void sub_810CC80(void); // asm/time_events.o -u8 sub_810D32C(void); +u8 IsMirageIslandPresent(void); // asm/field_specials.o void ResetCyclingRoadChallengeData(void); diff --git a/include/pokemon.h b/include/pokemon.h index e0ad7136c..39bde80cb 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -114,6 +114,8 @@ #define TYPE_DRAGON 0x10 #define TYPE_DARK 0x11 +#define PARTY_SIZE 6 + enum { NATURE_HARDY, NATURE_LONELY, @@ -376,8 +378,8 @@ struct PokemonStorage u8 unkArray[14]; }; -extern struct Pokemon gPlayerParty[6]; -extern struct Pokemon gEnemyParty[6]; +extern struct Pokemon gPlayerParty[PARTY_SIZE]; +extern struct Pokemon gEnemyParty[PARTY_SIZE]; void ZeroBoxMonData(struct BoxPokemon *boxMon); void ZeroMonData(struct Pokemon *mon); diff --git a/include/rom4.h b/include/rom4.h index f78386213..476a0e103 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -100,7 +100,7 @@ void sub_8054164(void); u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum); // get_map_light_level_from_warp u8 sav1_map_get_light_level(void); -// get_map_light_from_warp0 +u8 get_map_light_from_warp0(void); bool8 is_light_level_1_2_3_5_or_6(u8 a1); bool8 is_light_level_1_2_3_or_6(u8 a1); u8 is_light_level_8_or_9(u8); diff --git a/include/vars.h b/include/vars.h index 3fc71dc15..5477ba98a 100644 --- a/include/vars.h +++ b/include/vars.h @@ -7,6 +7,7 @@ #define VAR_FIRST_POKE 0x4023 #define VAR_MIRAGE_RND_H 0x4024 #define VAR_MIRAGE_RND_L 0x4025 +#define VAR_SECRET_BASE_MAP 0x4026 #define VAR_HAPPINESS_STEP_COUNTER 0x402A #define VAR_POISON_STEP_COUNTER 0x402B @@ -18,6 +19,8 @@ #define VAR_NATIONAL_DEX 0x4046 #define VAR_SHROOMISH_SIZE_RECORD 0x4047 +#define VAR_BIRCH_STATE 0x4049 + #define VAR_POKELOT_RND1 0x404B #define VAR_POKELOT_RND2 0x404C |