summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/global.h2
-rw-r--r--include/pokeblock.h2
-rw-r--r--include/vars.h1
-rw-r--r--include/wild_encounter.h39
4 files changed, 42 insertions, 2 deletions
diff --git a/include/global.h b/include/global.h
index 3421517d7..7547d523b 100644
--- a/include/global.h
+++ b/include/global.h
@@ -579,7 +579,7 @@ struct SaveBlock1
/*0x2BB0*/ u16 unk2BB0[6];
/*0x2BBC*/ u16 unk2BBC[6];
/*0x2BC8*/ u16 unk2BC8[6];
- /*0x2BD4*/ u16 unk2BD4[3];
+ /*0x2BD4*/ u16 unk2BD4[6];
/*0x2BE0*/ struct MailStruct mail[16];
/*0x2E20*/ u8 additionalPhrases[5]; // bitfield for 33 additional phrases in easy chat system
/*0x2E25*/ u8 unk2E25[3]; // possibly padding?
diff --git a/include/pokeblock.h b/include/pokeblock.h
index 5d52f8e55..b0e93f0e5 100644
--- a/include/pokeblock.h
+++ b/include/pokeblock.h
@@ -23,6 +23,7 @@ enum
};
void ClearPokeblocks(void);
+s16 PokeblockGetGain(u8, const struct Pokeblock *);
/*
void sub_810B96C(void);
@@ -32,7 +33,6 @@ s16 GetPokeblockData(const struct Pokeblock *, u8);
u8 sub_810C9E8(struct Pokeblock *);
void sub_810BA7C(u8);
bool8 PokeblockClearIfExists(u8);
-s16 PokeblockGetGain(u8, const struct Pokeblock *);
u8 sub_810CB68(u8, u8*);
void PokeblockCopyName(struct Pokeblock *pokeblock, u8 *dest);
void CB2_PreparePokeblockFeedScene(void);
diff --git a/include/vars.h b/include/vars.h
index f8057d4b5..763b7379d 100644
--- a/include/vars.h
+++ b/include/vars.h
@@ -30,6 +30,7 @@
#define VAR_RESET_RTC_ENABLE 0x402C
#define VAR_0x4037 0x4037
+#define VAR_ALTERING_CAVE_WILD_SET 0x403E
#define VAR_DAYS 0x4040
#define VAR_DEPT_STORE_FLOOR 0x4043
diff --git a/include/wild_encounter.h b/include/wild_encounter.h
new file mode 100644
index 000000000..c9d7c3fa1
--- /dev/null
+++ b/include/wild_encounter.h
@@ -0,0 +1,39 @@
+#ifndef GUARD_WILD_ENCOUNTER_H
+#define GUARD_WILD_ENCOUNTER_H
+
+struct WildPokemon
+{
+ u8 minLevel;
+ u8 maxLevel;
+ u16 species;
+};
+
+struct WildPokemonInfo
+{
+ u8 encounterRate;
+ const struct WildPokemon *wildPokemon;
+};
+
+struct WildPokemonHeader
+{
+ u8 mapGroup;
+ u8 mapNum;
+ const struct WildPokemonInfo *landMonsInfo;
+ const struct WildPokemonInfo *waterMonsInfo;
+ const struct WildPokemonInfo *rockSmashMonsInfo;
+ const struct WildPokemonInfo *fishingMonsInfo;
+};
+
+extern const struct WildPokemonHeader gWildMonHeaders[];
+
+void DisableWildEncounters(bool8 disabled);
+bool8 StandardWildEncounter(u16 a, u16 b);
+void ScrSpecial_RockSmashWildEncounter(void);
+bool8 SweetScentWildEncounter(void);
+bool8 DoesCurrentMapHaveFishingMons(void);
+void FishingWildEncounter(u8 rod);
+u16 GetLocalWildMon(bool8 *isWaterMon);
+u16 GetLocalWaterMon(void);
+bool8 UpdateRepelCounter(void);
+
+#endif // GUARD_WILD_ENCOUNTER_H