From 11fb13d63585cf92ab9490f75c115eed0da025ad Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 3 Jul 2019 10:35:46 +0200 Subject: Some pokemon jump work --- include/pokemon_jump.h | 2 +- include/strings.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'include') 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 f30e82321..e373a5660 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2708,6 +2708,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[]; -- cgit v1.2.3 From 75f165ed746cbc33cf9d0b9181abd9e861264f56 Mon Sep 17 00:00:00 2001 From: Gudf <28691694+Gudf@users.noreply.github.com> Date: Thu, 11 Jul 2019 20:16:39 +0200 Subject: Use a constant instead of integer literals when checking for shinyness --- include/constants/pokemon.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') 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 -- cgit v1.2.3