diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-20 11:51:22 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-20 11:51:22 -0400 |
| commit | 8d0d5cfd557b6c96b61a40c1997cf84a4f8fc3ed (patch) | |
| tree | 3a47f1d927c8fc9cb6510de88ed65a8953240bac /include | |
| parent | 4a239c4604e42c838e0b0b68f7f59eb4562484a2 (diff) | |
| parent | 3f762629e830c0cad66c4efeea5b918bdf4cce20 (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/pokemon.h | 3 | ||||
| -rw-r--r-- | include/pokemon_jump.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 8 |
3 files changed, 12 insertions, 1 deletions
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index f63d755ad..5d0e562bc 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -82,4 +82,7 @@ #define NUM_STATS 6 #define NUM_BATTLE_STATS 8 +// Shiny odds +#define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536 + #endif // GUARD_CONSTANTS_POKEMON_H diff --git a/include/pokemon_jump.h b/include/pokemon_jump.h index 9dbf194d0..d137c37b2 100644 --- a/include/pokemon_jump.h +++ b/include/pokemon_jump.h @@ -3,7 +3,7 @@ #include "main.h" -void sub_802EB24(u8, u8, u8, u8, u8); +void sub_802EB24(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u8 arg4); bool32 sub_802EB84(void); void sub_802A9A8(u16 monId, MainCallback callback); bool32 sub_802C908(u16 species); diff --git a/include/strings.h b/include/strings.h index 36a92281e..f30dffa7f 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2707,6 +2707,14 @@ extern const u8 gText_Symbols[]; extern const u8 gText_Register2[]; extern const u8 gText_Exit2[]; +// Pokemon jump +extern const u8 gText_WantToPlayAgain2[]; +extern const u8 gText_SomeoneDroppedOut2[]; +extern const u8 gText_CommunicationStandby4[]; +extern const u8 gText_AwesomeWonF701F700[]; +extern const u8 gText_FilledStorageSpace2[]; +extern const u8 gText_CantHoldMore[]; + // Pokenav Match Call extern const u8 gText_CallCantBeMadeHere[]; extern const u8 gText_NumberRegistered[]; |