dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into modern_gcc

Browse Source
This commit is contained in:
PikalaxALT
2019-07-20 11:51:22 -04:00
parent 4a239c4604 3f762629e8
commit 8d0d5cfd55
11 changed files with 785 additions and 2017 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/constants/pokemon.h
View File

@@ -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

2
include/pokemon_jump.h
View File

@@ -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);

8
include/strings.h
View File

@@ -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[];