diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_tower.h | 1 | ||||
| -rwxr-xr-x | include/field_map_obj.h | 3 | ||||
| -rw-r--r-- | include/field_region_map.h | 1 | ||||
| -rw-r--r-- | include/field_specials.h | 24 | ||||
| -rwxr-xr-x | include/pokeblock.h | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | include/pokemon.h | 2 | ||||
| -rw-r--r-- | include/pokemon_summary_screen.h | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | include/region_map.h | 2 | ||||
| -rw-r--r-- | include/script.h | 1 | ||||
| -rw-r--r-- | include/tv.h | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | include/vars.h | 5 |
11 files changed, 41 insertions, 3 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h index 193905b93..75ea405ab 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -3,5 +3,6 @@ void sub_8134AC0(void *); u16 sub_8135D3C(u8); +void sub_8135FF4(u8*); #endif // GUARD_BATTLE_TOWER_H diff --git a/include/field_map_obj.h b/include/field_map_obj.h index d051ea097..6595a51ca 100755 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -426,5 +426,8 @@ u8 sub_8060B38(u8); u8 sub_8060B64(u8); u8 GetOppositeDirection(u8); void sub_80634D0(struct MapObject *, struct Sprite *); +u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8); +void CameraObjectSetFollowedObjectId(u8); +u8 sub_805ADDC(u8); #endif // GUARD_FIELD_MAP_OBJ_H diff --git a/include/field_region_map.h b/include/field_region_map.h index 93b8c6d68..a7e81b418 100644 --- a/include/field_region_map.h +++ b/include/field_region_map.h @@ -1,6 +1,7 @@ #ifndef GUARD_FIELD_REGION_MAP_H #define GUARD_FIELD_REGION_MAP_H +void FieldInitRegionMap(void(void)); void CB2_FieldInitRegionMap(void); void VBlankCB_FieldRegionMap(void); void CB2_FieldRegionMap(void); diff --git a/include/field_specials.h b/include/field_specials.h index d0eb12065..710f0a2a0 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -1,6 +1,30 @@ #ifndef GUARD_FIELD_SPECIALS_H #define GUARD_FIELD_SPECIALS_H +struct ElevatorMenu { + u8 var0; + s8 var1; + s8 var2; + u8 var3; +}; + +extern struct ElevatorMenu gUnknown_03000760[20]; +extern struct WarpData gUnknown_020297F0; +extern u8 gBattleOutcome; + +extern u16 gScriptResult; +extern u8 gUnknown_02039250; +extern u8 gUnknown_02039251; +extern u32 gUnknown_02039254; +extern u8 gUnknown_02039258; +extern u8 gUnknown_02039259; +extern u8 gUnknown_0203925A; +extern u8 gUnknown_0203925B; +extern u8 gUnknown_0203925C; + +extern u16 gSpecialVar_0x8004; +extern u16 gSpecialVar_0x8005; + void ResetCyclingRoadChallengeData(void); bool32 CountSSTidalStep(u16); u8 GetSSTidalLocation(s8 *, s8 *, s16 *, s16 *); diff --git a/include/pokeblock.h b/include/pokeblock.h index c2a1ff860..0d8e965e4 100755 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -30,5 +30,6 @@ void sub_810BA7C(u8); void ClearPokeblocks(void); bool8 sub_810CA6C(u8); s16 sub_810CAE4(u8, const struct Pokeblock *); +u8 sub_810CB68(u8, u8*); #endif // GUARD_POKEBLOCK_H diff --git a/include/pokemon.h b/include/pokemon.h index be8e4e56d..46366511d 100644..100755 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -409,6 +409,7 @@ extern u8 gStatStageRatios[][2]; extern struct Pokemon gPlayerParty[PARTY_SIZE]; extern struct Pokemon gEnemyParty[PARTY_SIZE]; +extern struct PokemonStorage gPokemonStorage; void ZeroBoxMonData(struct BoxPokemon *boxMon); void ZeroMonData(struct Pokemon *mon); @@ -511,5 +512,6 @@ void sub_8040B8C(void); void SetWildMonHeldItem(void); u8 *sub_8040D08(); bool32 sub_8040D3C(u16 species, u8 *name, u8 language); +u16 GetMonEVCount(struct Pokemon *); #endif // GUARD_POKEMON_H diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index 71259c887..c1b99c367 100644 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -12,5 +12,6 @@ u8 GetMonStatusAndPokerus(); u8 *sub_80A1E9C(u8 *dest, const u8 *src, u8); u8 *PokemonSummaryScreen_CopyPokemonLevel(u8 *dest, u8 level); u8 PokemonSummaryScreen_CheckOT(struct Pokemon *pokemon); +bool8 CheckPartyPokerus(struct Pokemon *, u8); #endif // GUARD_POKEMON_SUMMARY_SCREEN_H diff --git a/include/region_map.h b/include/region_map.h index 0cef566f6..6dfa4dcf0 100644..100755 --- a/include/region_map.h +++ b/include/region_map.h @@ -6,7 +6,7 @@ void sub_80FAB10(void); u8 sub_80FAB60(void); void sub_80FBB3C(u16, u16); void sub_80FBCF0(u32, u8); -void sub_80FBFB4(u8 *str, u8 region, u8); +void sub_80FBFB4(u8 *str, u16 region, u8); void CopyMapName(); u8 *CopyLocationName(u8 *dest, u8 location); diff --git a/include/script.h b/include/script.h index 4070a838f..5577fcb01 100644 --- a/include/script.h +++ b/include/script.h @@ -56,5 +56,6 @@ void ClearRamScript(void); bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId); u8 *GetRamScript(u8 objectId, u8 *script); u16 gScriptResult; +extern u16 gScriptLastTalked; #endif // GUARD_SCRIPT_H diff --git a/include/tv.h b/include/tv.h index 277d29750..3243fff2c 100644 --- a/include/tv.h +++ b/include/tv.h @@ -18,7 +18,7 @@ enum TVSHOW_MASS_OUTBREAK = 41, }; -extern u8 *gUnknown_083D1464[3]; +extern u8 *const gUnknown_083D1464[3]; void ClearTVShowData(void); u8 sub_80BDEAC(u8 *); @@ -106,5 +106,6 @@ void DoTVShowTodaysSmartShopper(void); void sub_80BE3BC(void); void UpdateTVShowsPerDay(u16); void sub_80C045C(); +void sub_80BF088(u8, s32); #endif // GUARD_TV_H diff --git a/include/vars.h b/include/vars.h index cb5bb3296..f31ebde84 100644..100755 --- a/include/vars.h +++ b/include/vars.h @@ -17,6 +17,7 @@ #define VAR_DAYS 0x4040 +#define VAR_DEPT_STORE_FLOOR 0x4043 #define VAR_POKELOT_PRIZE 0x4045 #define VAR_NATIONAL_DEX 0x4046 #define VAR_SHROOMISH_SIZE_RECORD 0x4047 @@ -31,10 +32,12 @@ #define VAR_0x4054 0x4054 #define VAR_0x4089 0x4089 +#define VAR_0x4095 0x4095 #define VAR_0x4097 0x4097 - +#define VAR_0x409a 0x409a #define VAR_PORTHOLE 0x40B4 #define VAR_0x40BC 0x40BC +#define VAR_0x40C2 0x40C2 #endif // GUARD_VARS_H |