ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 23:23:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1305 from GriffinRichards/doc-battletv

Browse Source 
Document battle tv data
This commit is contained in:
GriffinR 2021-01-21 12:27:14 -05:00 committed by GitHub
commit 8fe4d004e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 633 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/battle_move_effects.h
View File

@ -216,4 +216,6 @@
#define EFFECT_DRAGON_DANCE 212 #define EFFECT_DRAGON_DANCE 212
#define EFFECT_CAMOUFLAGE 213 #define EFFECT_CAMOUFLAGE 213
#define NUM_BATTLE_MOVE_EFFECTS 214
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

2
include/tv.h
View File

@ -8,7 +8,7 @@ extern u8 *const gTVStringVarPtrs[3];
void ClearTVShowData(void); void ClearTVShowData(void);
void sub_80EE184(void); void sub_80EE184(void);
void sub_80EE35C(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u16 betterMove); void TryPutBattleSeminarOnAir(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u16 betterMove);
void TryPutFrontierTVShowOnAir(u16 winStreak, u8 facility); void TryPutFrontierTVShowOnAir(u16 winStreak, u8 facility);
void DoTVShow(void); void DoTVShow(void);
void DoTVShowInSearchOfTrainers(void); void DoTVShowInSearchOfTrainers(void);

900
src/battle_tv.c
View File

File diff suppressed because it is too large Load Diff

2
src/tv.c
View File

@ -2306,7 +2306,7 @@ void TryPutLotteryWinnerReportOnAir(void)
} }
} }
void sub_80EE35C(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u16 betterMove) void TryPutBattleSeminarOnAir(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u16 betterMove)
{ {
TVShow *show; TVShow *show;
u8 i; u8 i;