diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-11 17:36:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-11 17:36:58 -0700 |
| commit | fcb919c7cf56e0099f5aa2e455930e2eb080f90e (patch) | |
| tree | b0e686b62f386a424ad34308facc3b1ab9677798 /include | |
| parent | ba6f60e4674785e4442232d0dd55bf13b9dab228 (diff) | |
| parent | 78bd32c68bc8f20b5d3aeb0d0dd694608fee62da (diff) | |
Merge pull request #594 from PikalaxALT/taya
Taya debug window
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_setup.h | 2 | ||||
| -rw-r--r-- | include/mauville_man.h | 2 | ||||
| -rw-r--r-- | include/pokemon_storage_system.h | 1 | ||||
| -rw-r--r-- | include/region_map.h | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h index 8423a6e6e..88afcdf0a 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -47,6 +47,8 @@ struct TrainerEyeTrainer u16 mapNum; }; +extern const struct TrainerEyeTrainer gTrainerEyeTrainers[56]; + void BattleSetup_StartWildBattle(void); void BattleSetup_StartRoamerBattle(void); void BattleSetup_StartScriptedWildBattle(void); diff --git a/include/mauville_man.h b/include/mauville_man.h index 622cd1bfb..5b2d00c6a 100644 --- a/include/mauville_man.h +++ b/include/mauville_man.h @@ -6,5 +6,7 @@ void SetupMauvilleOldMan(void); void sub_80F7F30(void); void sub_80F83D0(void); +void debug_sub_810B32C(u8); +u8 GetCurrentMauvilleOldMan(void); #endif // GUARD_MAUVILLE_OLD_MAN_H diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 5319b7a2d..c6c37c123 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -298,5 +298,6 @@ void sub_809CFF0(void); void sub_809D034(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); void sub_809D104(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); void sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height); +void ShowPokemonStorageSystem(void); #endif // GUARD_POKEMON_STORAGE_SYSTEM_H diff --git a/include/region_map.h b/include/region_map.h index e7a357fe2..89a47cd05 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -69,5 +69,6 @@ const u8 *GetMapSectionName(u8 *dest, u16 mapSectionId, u16 length); const u8 *CopyMapName(u8 *dest, u16 b); const u8 *CopyLocationName(u8 *dest, u16 b); void CB2_InitFlyRegionMap(void); +void debug_sub_8110F28(void); #endif // GUARD_REGION_MAP_H |