diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/decoration.h | 1 | ||||
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | include/secret_base.h | 5 | ||||
| -rw-r--r-- | include/use_pokeblock.h | 13 | ||||
| -rw-r--r-- | include/vars.h | 2 |
5 files changed, 19 insertions, 4 deletions
diff --git a/include/decoration.h b/include/decoration.h index 2e72e305a..1b83964d9 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -291,6 +291,7 @@ extern void sub_8134104(u8); // src/decoration_inventory extern bool8 sub_807D770(void); extern void sub_8109DAC(u8); // src/trader extern void ReshowPlayerPC(u8); // src/player_pc +void Task_SecretBasePC_Decoration(u8); void sub_80FE2B4(void); void Task_DecorationPCProcessMenuInput(u8); diff --git a/include/global.h b/include/global.h index f0eb7401f..6b0a0cb01 100644 --- a/include/global.h +++ b/include/global.h @@ -136,7 +136,7 @@ struct SecretBaseRecord /*0x1A09*/ u8 sbr_field_1_5:1; /*0x1A09*/ u8 sbr_field_1_6:2; /*0x1A0A*/ u8 sbr_field_2[7]; // 0xFF bytes? - /*0x1A12*/ u8 trainerId[4]; // byte 0 is used for determining trainer class + /*0x1A11*/ u8 trainerId[4]; // byte 0 is used for determining trainer class /*0x1A16*/ u16 sbr_field_e; /*0x1A18*/ u8 sbr_field_10; /*0x1A19*/ u8 sbr_field_11; diff --git a/include/secret_base.h b/include/secret_base.h index bb747bb02..0844cff26 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -5,12 +5,11 @@ void ResetSecretBases(void); void sub_80BB970(struct MapEvents *); u8 sub_80BBB24(void); void sub_80BBCCC(u8); -void sub_80BC038(); +void sub_80BC038(struct MapPosition *, struct MapEvents *); u8 sub_80BC050(); u8 *GetSecretBaseMapName(u8 *); void sub_80BC300(); -const u8 sub_80BCCA4(u8); -u8 *sub_80BCCE8(void); +const u8 *sub_80BCCE8(void); void sub_80BCF1C(u8); void sub_80BD674(void *, u32, u8); diff --git a/include/use_pokeblock.h b/include/use_pokeblock.h new file mode 100644 index 000000000..978476d89 --- /dev/null +++ b/include/use_pokeblock.h @@ -0,0 +1,13 @@ +// +// Created by Scott Norton on 5/31/17. +// + +#ifndef POKERUBY_USE_POKEBLOCK_H +#define POKERUBY_USE_POKEBLOCK_H + +extern void *gUnknown_02030400; +extern s16 gUnknown_02039312; + +void sub_8136130(struct Pokeblock *, MainCallback); + +#endif //POKERUBY_USE_POKEBLOCK_H diff --git a/include/vars.h b/include/vars.h index 179fd6f93..631b9a41d 100644 --- a/include/vars.h +++ b/include/vars.h @@ -1,6 +1,8 @@ #ifndef GUARD_VARS_H #define GUARD_VARS_H +#define VAR_0x3F20 0x3F20 + #define VAR_0x4000 0x4000 #define VAR_0x4001 0x4001 #define VAR_0x4002 0x4002 |