diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_scripts.h | 6 | ||||
| -rw-r--r-- | include/evolution_scene.h | 4 | ||||
| -rw-r--r-- | include/pokemon.h | 4 | ||||
| -rw-r--r-- | include/quest_log.h | 4 | ||||
| -rw-r--r-- | include/vs_seeker.h | 1 |
5 files changed, 13 insertions, 6 deletions
diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 870b0524e..184527587 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -230,4 +230,10 @@ extern const u8 gUnknown_81D9A88[]; extern const u8 gUnknown_81D91A1[]; // knizz: silph scope unveil extern const u8 gUnknown_81D88D7[]; +extern const u8 *const gBattleScriptsForMoveEffects[]; +extern const u8 *const gBattlescriptsForBallThrow[]; +extern const u8 *const gBattlescriptsForRunningByItem[]; +extern const u8 *const gBattlescriptsForUsingItem[]; +extern const u8 *const gBattlescriptsForSafariActions[]; + #endif // GUARD_BATTLE_SCRIPTS_H diff --git a/include/evolution_scene.h b/include/evolution_scene.h index 1d87ceb76..6ceed99c1 100644 --- a/include/evolution_scene.h +++ b/include/evolution_scene.h @@ -3,8 +3,8 @@ #include "global.h" -void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID); -void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID); +void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8, u8 partyID); +void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8, u8 partyID); void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID); extern void (*gCB2_AfterEvolution)(void); diff --git a/include/pokemon.h b/include/pokemon.h index c5ee4eda5..372b2abb6 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -629,10 +629,10 @@ u8 GetTrainerEncounterMusicId(u16 trainer); void AdjustFriendship(struct Pokemon *mon, u8 event); void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies); u16 GetMonEVCount(struct Pokemon *mon); -void sub_8043A68(void); +void RandomlyGivePartyPokerus(struct Pokemon *party); u8 CheckPartyPokerus(struct Pokemon *party, u8 selection); u8 CheckPartyHasHadPokerus(struct Pokemon *party, u8 selection); -void sub_8043B40(void); +void PartySpreadPokerus(struct Pokemon *party); bool8 TryIncrementMonLevel(struct Pokemon *mon); u32 CanMonLearnTMHM(struct Pokemon *mon, u8 tm); u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves); diff --git a/include/quest_log.h b/include/quest_log.h index 3d9dfb86d..3a2f31780 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -14,6 +14,7 @@ struct UnkStruct_3005E90 u8 unk_2; }; +extern u8 gUnknown_203ADFA; extern u8 gUnknown_3005E88; extern u16 gUnknown_3005E8C; extern struct UnkStruct_3005E90 gUnknown_3005E90; @@ -41,7 +42,6 @@ void sub_8112364(void); u8 sub_8112CAC(void); void sub_81138F8(void); void sub_812C224(void); - -extern u8 gUnknown_203ADFA; +void sub_812BFDC(void); #endif //GUARD_QUEST_LOG_H diff --git a/include/vs_seeker.h b/include/vs_seeker.h index efc014a4a..a9599d324 100644 --- a/include/vs_seeker.h +++ b/include/vs_seeker.h @@ -10,5 +10,6 @@ int sub_810CE64(u16 a0); bool8 sub_810CF04(u8 a0); u8 sub_810CF54(); void sub_810D0D0(void); +void sub_810CB90(void); #endif //GUARD_VS_SEEKER_H |