diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-12-13 19:21:47 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-12-13 19:21:47 -0500 |
| commit | f4515f14dc1402ae2af2f83e5e6d7a9338371eeb (patch) | |
| tree | 24d6a55e65a089a293e5813febc1be183d092cf6 /include | |
| parent | 8616d7172a14332425e7c876e7731d484369f9e4 (diff) | |
| parent | 6ea4a7a40cfe1d30b19a179818ef9423d28129e8 (diff) | |
Merge branch 'pokedex_screen' of github.com:PikalaxALT/pokefirered into pokedex_screen
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 5 | ||||
| -rw-r--r-- | include/pokedex_screen.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/global.h b/include/global.h index 219c09c62..9df153270 100644 --- a/include/global.h +++ b/include/global.h @@ -765,9 +765,8 @@ struct SaveBlock1 /*0x3120*/ struct MEventBuffers mysteryEventBuffers; /*0x348C*/ u8 filler_348C[400]; /*0x361C*/ struct RamScript ramScript; - /*0x3A08*/ u8 filler3A08[12]; - /*0x3A14*/ u8 seen2[DEX_FLAGS_NO]; - /*0x3A48*/ u8 filler_3a48[4]; + /*0x3A08*/ u8 filler3A08[16]; + /*0x3A18*/ u8 seen2[DEX_FLAGS_NO]; /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH]; /*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS]; /*0x3A94*/ u8 filler3A94[0x204]; diff --git a/include/pokedex_screen.h b/include/pokedex_screen.h index 9cc362d59..6dc640719 100644 --- a/include/pokedex_screen.h +++ b/include/pokedex_screen.h @@ -2,6 +2,6 @@ #define GUARD_POKEDEX_SCREEN_H void CB2_OpenPokedexFromStartMenu(void); -s8 sub_8104AB0(u16 nationalDexNo, u8 caseID, u8 unk); +s8 sub_8104AB0(u16 nationalDexNo, u8 caseID, bool8 indexIsSpecies); #endif //GUARD_POKEDEX_SCREEN_H diff --git a/include/strings.h b/include/strings.h index 0288dc05f..bc1aee889 100644 --- a/include/strings.h +++ b/include/strings.h @@ -975,7 +975,9 @@ extern const u8 gUnknown_8415DD7[]; extern const u8 gUnknown_8415F3D[]; extern const u8 gUnknown_8415F4A[]; extern const u8 gUnknown_8415F66[]; +extern const u8 gUnknown_8415F6C[]; extern const u8 gUnknown_8415FFF[]; +extern const u8 gUnknown_8416002[]; // trainer card extern const u8 gText_WaitingTrainerFinishReading[]; |