summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2020-01-10 12:56:31 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2020-01-10 22:28:20 +0800
commite300f2ece0bd3c5c0967ac635a48ccd8ef13cf50 (patch)
treea389f3d07061bf3f84d9c1d125a42f02ade4840b /include
parent5734043a202bb831609736802de615687531f7f3 (diff)
script_pokemon_util_80BF8FC
Diffstat (limited to 'include')
-rw-r--r--include/pokemon.h1
-rw-r--r--include/pokemon_summary_screen.h1
-rw-r--r--include/script_pokemon_80F8.h12
-rw-r--r--include/script_pokemon_81B9.h8
-rw-r--r--include/script_pokemon_util_80A0058.h1
5 files changed, 3 insertions, 20 deletions
diff --git a/include/pokemon.h b/include/pokemon.h
index 7bc1239f1..999879880 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -513,6 +513,7 @@ extern const u16 *const gLevelUpLearnsets[];
extern const u8 gFacilityClassToPicIndex[];
extern const u8 gFacilityClassToTrainerClass[];
extern const struct SpriteTemplate gUnknown_825DEF0[];
+extern const u8 gPPUpGetMask[];
void ZeroBoxMonData(struct BoxPokemon *boxMon);
void ZeroMonData(struct Pokemon *mon);
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index 3695d46df..2b8f96316 100644
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -34,5 +34,6 @@ enum PokemonSummaryScreenPage
s32 GetLastViewedMonIndex(void);
void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4);
+void sub_8138B38(u8);
#endif // GUARD_POKEMON_SUMMARY_SCREEN_H
diff --git a/include/script_pokemon_80F8.h b/include/script_pokemon_80F8.h
deleted file mode 100644
index 8a5bb12e1..000000000
--- a/include/script_pokemon_80F8.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef GUARD_SCRIPTPOKE80F8_H
-#define GUARD_SCRIPTPOKE80F8_H
-
-#include "global.h"
-
-void ShowContestWinner(void);
-u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8);
-u8 ScriptGiveEgg(u16);
-void CreateScriptedWildMon(u16, u8, u16);
-void ScriptSetMonMoveSlot(u8, u16, u8);
-
-#endif
diff --git a/include/script_pokemon_81B9.h b/include/script_pokemon_81B9.h
deleted file mode 100644
index d49095fcc..000000000
--- a/include/script_pokemon_81B9.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef GUARD_SCRIPTPOKE81B9_H
-#define GUARD_SCRIPTPOKE81B9_H
-
-#include "global.h"
-
-void sub_81B9404(void);
-
-#endif
diff --git a/include/script_pokemon_util_80A0058.h b/include/script_pokemon_util_80A0058.h
index b63a7b0ef..75e826e93 100644
--- a/include/script_pokemon_util_80A0058.h
+++ b/include/script_pokemon_util_80A0058.h
@@ -6,5 +6,6 @@ bool8 ScriptGiveEgg(u16 species);
void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot);
void sp000_heal_pokemon(void);
void ReducePlayerPartyToThree(void);
+void CreateScriptedWildMon(u16 species, u8 level, u16 item);
#endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H